summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-filesystems/recipes-support/fuse/files/CVE-2018-10906-1.patch
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-07-09 00:58:53 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-09-06 20:53:59 +0300
commit066be20a36c3f99cf5f0ba237f4e464b3378148a (patch)
treeb56c6de5993d3f79d1da0f5551cfb173b84e4ecd /meta-openembedded/meta-filesystems/recipes-support/fuse/files/CVE-2018-10906-1.patch
parent134b6d49de68990ff80b297e3cb627dc168a497e (diff)
downloadopenbmc-066be20a36c3f99cf5f0ba237f4e464b3378148a.tar.xz
meta-openembedded: sumo refresh b0950aeff5..be79b8b111
Update meta-openembedded to sumo HEAD. Armin Kuster (2): wireshark: update to 2.4.7 wireshark: update to 2.4.8 Denys Dmytriyenko (1): devmem2: ensure word is 32-bit, add support for 64-bit long Jagadeesh Krishnanjanappa (1): fuse: CVE-2018-10906 Oleksandr Kravchuk (1): libsodium: update to 1.0.16 changqing.li@windriver.com (1): php: upgrade 7.2.4 -> 7.2.7 Included: leimaohui (2): python-pytest: Fix conflict error as following: libnih: Fix do_package error when enable mutilib. Change-Id: I036baed004e407d5e9fde46eba75b6cc7e3479e0 Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-filesystems/recipes-support/fuse/files/CVE-2018-10906-1.patch')
-rw-r--r--meta-openembedded/meta-filesystems/recipes-support/fuse/files/CVE-2018-10906-1.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/files/CVE-2018-10906-1.patch b/meta-openembedded/meta-filesystems/recipes-support/fuse/files/CVE-2018-10906-1.patch
new file mode 100644
index 000000000..83bef3022
--- /dev/null
+++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/files/CVE-2018-10906-1.patch
@@ -0,0 +1,52 @@
+From 28bdae3d113ef479c1660a581ef720cdc33bf466 Mon Sep 17 00:00:00 2001
+From: Jann Horn <jannh@google.com>
+Date: Fri, 13 Jul 2018 15:15:36 -0700
+Subject: [PATCH] fusermount: don't feed "escaped commas" into mount options
+
+The old code permits the following behavior:
+
+$ _FUSE_COMMFD=10000 priv_strace -etrace=mount -s200 fusermount -o 'foobar=\,allow_other' mount
+mount("/dev/fuse", ".", "fuse", MS_NOSUID|MS_NODEV, "foobar=\\,allow_other,fd=3,rootmode=40000,user_id=1000,group_id=1000") = -1 EINVAL (Invalid argument)
+
+However, backslashes do not have any special meaning for the kernel here.
+
+As it happens, you can't abuse this because there is no FUSE mount option
+that takes a string value that can contain backslashes; but this is very
+brittle. Don't interpret "escape characters" in places where they don't
+work.
+
+CVE: CVE-2018-10906
+Upstream-Status: Backport [https://github.com/libfuse/libfuse/commit/28bdae3d113ef479c1660a581ef720cdc33bf466]
+
+Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
+---
+ util/fusermount.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/util/fusermount.c b/util/fusermount.c
+index 0e1d34d..143bd4a 100644
+--- a/util/fusermount.c
++++ b/util/fusermount.c
+@@ -29,6 +29,7 @@
+ #include <sys/socket.h>
+ #include <sys/utsname.h>
+ #include <sched.h>
++#include <stdbool.h>
+
+ #define FUSE_COMMFD_ENV "_FUSE_COMMFD"
+
+@@ -754,8 +755,10 @@ static int do_mount(const char *mnt, char **typep, mode_t rootmode,
+ unsigned len;
+ const char *fsname_str = "fsname=";
+ const char *subtype_str = "subtype=";
++ bool escape_ok = begins_with(s, fsname_str) ||
++ begins_with(s, subtype_str);
+ for (len = 0; s[len]; len++) {
+- if (s[len] == '\\' && s[len + 1])
++ if (escape_ok && s[len] == '\\' && s[len + 1])
+ len++;
+ else if (s[len] == ',')
+ break;
+--
+2.13.3
+