diff options
| author | Miklos Szeredi <mszeredi@suse.cz> | 2015-05-22 10:58:43 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@suse.cz> | 2015-05-22 11:01:12 +0200 |
| commit | 0516ee45ece94379764c4f57b07fd4fde09a123f (patch) | |
| tree | d26354081a6cf1f6a7b69e6766929e03cfd8351e | |
| parent | cd757d22b4340991f6b085ffb626020ee4c4fefa (diff) | |
| download | fuse-0516ee45ece94379764c4f57b07fd4fde09a123f.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-02-26 Miklos Szeredi <miklos@szeredi.hu> * libfuse: fix fuse_remove_signal_handlers() to properly restore diff --git a/lib/mount_util.c b/lib/mount_util.c index 3cad2e6..defb92f 100644 --- a/lib/mount_util.c +++ b/lib/mount_util.c @@ -96,10 +96,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); @@ -147,10 +149,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); @@ -206,10 +215,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); |