diff options
Diffstat (limited to 'meta-filesystems/recipes-support/fuse/files/001-fix_exec_environment_for_mount_and_umount.patch')
-rw-r--r-- | meta-filesystems/recipes-support/fuse/files/001-fix_exec_environment_for_mount_and_umount.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/meta-filesystems/recipes-support/fuse/files/001-fix_exec_environment_for_mount_and_umount.patch b/meta-filesystems/recipes-support/fuse/files/001-fix_exec_environment_for_mount_and_umount.patch new file mode 100644 index 000000000..8332bfbb7 --- /dev/null +++ b/meta-filesystems/recipes-support/fuse/files/001-fix_exec_environment_for_mount_and_umount.patch | |||
@@ -0,0 +1,63 @@ | |||
1 | From cfe13b7a217075ae741c018da50cd600e5330de2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Miklos Szeredi <mszeredi@suse.cz> | ||
3 | Date: Fri, 22 May 2015 10:58:43 +0200 | ||
4 | Subject: [PATCH] libfuse: fix exec environment for mount and umount | ||
5 | |||
6 | Found by Tavis Ormandy (CVE-2015-3202). | ||
7 | |||
8 | Upstream-Status: Submitted | ||
9 | Signed-off-by: Tudor Florea <tudor.florea@enea.com> | ||
10 | |||
11 | --- | ||
12 | --- a/lib/mount_util.c | ||
13 | +++ b/lib/mount_util.c | ||
14 | @@ -95,10 +95,12 @@ static int add_mount(const char *prognam | ||
15 | goto out_restore; | ||
16 | } | ||
17 | if (res == 0) { | ||
18 | + char *env = NULL; | ||
19 | + | ||
20 | sigprocmask(SIG_SETMASK, &oldmask, NULL); | ||
21 | setuid(geteuid()); | ||
22 | - execl("/bin/mount", "/bin/mount", "--no-canonicalize", "-i", | ||
23 | - "-f", "-t", type, "-o", opts, fsname, mnt, NULL); | ||
24 | + execle("/bin/mount", "/bin/mount", "--no-canonicalize", "-i", | ||
25 | + "-f", "-t", type, "-o", opts, fsname, mnt, NULL, &env); | ||
26 | fprintf(stderr, "%s: failed to execute /bin/mount: %s\n", | ||
27 | progname, strerror(errno)); | ||
28 | exit(1); | ||
29 | @@ -146,10 +148,17 @@ static int exec_umount(const char *progn | ||
30 | goto out_restore; | ||
31 | } | ||
32 | if (res == 0) { | ||
33 | + char *env = NULL; | ||
34 | + | ||
35 | sigprocmask(SIG_SETMASK, &oldmask, NULL); | ||
36 | setuid(geteuid()); | ||
37 | - execl("/bin/umount", "/bin/umount", "-i", rel_mnt, | ||
38 | - lazy ? "-l" : NULL, NULL); | ||
39 | + if (lazy) { | ||
40 | + execle("/bin/umount", "/bin/umount", "-i", rel_mnt, | ||
41 | + "-l", NULL, &env); | ||
42 | + } else { | ||
43 | + execle("/bin/umount", "/bin/umount", "-i", rel_mnt, | ||
44 | + NULL, &env); | ||
45 | + } | ||
46 | fprintf(stderr, "%s: failed to execute /bin/umount: %s\n", | ||
47 | progname, strerror(errno)); | ||
48 | exit(1); | ||
49 | @@ -205,10 +214,12 @@ static int remove_mount(const char *prog | ||
50 | goto out_restore; | ||
51 | } | ||
52 | if (res == 0) { | ||
53 | + char *env = NULL; | ||
54 | + | ||
55 | sigprocmask(SIG_SETMASK, &oldmask, NULL); | ||
56 | setuid(geteuid()); | ||
57 | - execl("/bin/umount", "/bin/umount", "--no-canonicalize", "-i", | ||
58 | - "--fake", mnt, NULL); | ||
59 | + execle("/bin/umount", "/bin/umount", "--no-canonicalize", "-i", | ||
60 | + "--fake", mnt, NULL, &env); | ||
61 | fprintf(stderr, "%s: failed to execute /bin/umount: %s\n", | ||
62 | progname, strerror(errno)); | ||
63 | exit(1); | ||