diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2015-05-22 10:58:43 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@suse.cz> | 2015-05-22 10:58:43 +0200 |
| commit | cfe13b7a217075ae741c018da50cd600e5330de2 (patch) | |
| tree | 4e9cb09febab9a58d494c6dc9339aebfc61118ed | |
| parent | 04ad73fab6ed679941958ed155169ba4146f719e (diff) | |
| download | libfuse-cfe13b7a217075ae741c018da50cd600e5330de2.tar.gz | |
libfuse: fix exec environment for mount and umount
Found by Tavis Ormandy (CVE-2015-3202).
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mount_util.c | 23 |
2 files changed, 22 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2015-05-22 Miklos Szeredi <miklos@szeredi.hu> + + * libfuse: fix exec environment for mount and umount. Found by + Tavis Ormandy (CVE-2015-3202). + 2015-04-23 Miklos Szeredi <miklos@szeredi.hu> * libfuse: add FUSE_CAP_NO_OPEN_SUPPORT flag to ->init() diff --git a/lib/mount_util.c b/lib/mount_util.c index 87e3888..589f76d 100644 --- a/lib/mount_util.c +++ b/lib/mount_util.c @@ -97,10 +97,12 @@ static int add_mount(const char *progname, const char *fsname, goto out_restore; } if (res == 0) { + char *env = NULL; + sigprocmask(SIG_SETMASK, &oldmask, NULL); setuid(geteuid()); - execl("/bin/mount", "/bin/mount", "--no-canonicalize", "-i", - "-f", "-t", type, "-o", opts, fsname, mnt, NULL); + execle("/bin/mount", "/bin/mount", "--no-canonicalize", "-i", + "-f", "-t", type, "-o", opts, fsname, mnt, NULL, &env); fprintf(stderr, "%s: failed to execute /bin/mount: %s\n", progname, strerror(errno)); exit(1); @@ -148,10 +150,17 @@ static int exec_umount(const char *progname, const char *rel_mnt, int lazy) goto out_restore; } if (res == 0) { + char *env = NULL; + sigprocmask(SIG_SETMASK, &oldmask, NULL); setuid(geteuid()); - execl("/bin/umount", "/bin/umount", "-i", rel_mnt, - lazy ? "-l" : NULL, NULL); + if (lazy) { + execle("/bin/umount", "/bin/umount", "-i", rel_mnt, + "-l", NULL, &env); + } else { + execle("/bin/umount", "/bin/umount", "-i", rel_mnt, + NULL, &env); + } fprintf(stderr, "%s: failed to execute /bin/umount: %s\n", progname, strerror(errno)); exit(1); @@ -207,10 +216,12 @@ static int remove_mount(const char *progname, const char *mnt) goto out_restore; } if (res == 0) { + char *env = NULL; + sigprocmask(SIG_SETMASK, &oldmask, NULL); setuid(geteuid()); - execl("/bin/umount", "/bin/umount", "--no-canonicalize", "-i", - "--fake", mnt, NULL); + execle("/bin/umount", "/bin/umount", "--no-canonicalize", "-i", + "--fake", mnt, NULL, &env); fprintf(stderr, "%s: failed to execute /bin/umount: %s\n", progname, strerror(errno)); exit(1); |