From 46cbdbcd69c5da4801506a1bb472d683b1163ea9 Mon Sep 17 00:00:00 2001 From: Sona Sarmadi Date: Wed, 30 Dec 2015 10:05:07 +0100 Subject: kernel-fs: CVE-2015-5706 Fixes double fput(). References: =========== https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-5706 CVE assignment: http://seclists.org/oss-sec/2015/q3/270 Upstream/original fix: ====================== https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/ patch/?id=f15133df088ecadd141ea1907f2c96df67c729f0 Signed-off-by: Sona Sarmadi Signed-off-by: Tudor Florea --- .../linux-hierofalcon-3.19/fs-CVE-2015-5706.patch | 43 ++++++++++++++++++++++ recipes-kernel/linux/linux-hierofalcon_3.19.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 recipes-kernel/linux/linux-hierofalcon-3.19/fs-CVE-2015-5706.patch diff --git a/recipes-kernel/linux/linux-hierofalcon-3.19/fs-CVE-2015-5706.patch b/recipes-kernel/linux/linux-hierofalcon-3.19/fs-CVE-2015-5706.patch new file mode 100644 index 0000000..46aa441 --- /dev/null +++ b/recipes-kernel/linux/linux-hierofalcon-3.19/fs-CVE-2015-5706.patch @@ -0,0 +1,43 @@ +From f15133df088ecadd141ea1907f2c96df67c729f0 Mon Sep 17 00:00:00 2001 +From: Al Viro +Date: Fri, 8 May 2015 22:53:15 -0400 +Subject: path_openat(): fix double fput() + +path_openat() jumps to the wrong place after do_tmpfile() - it has +already done path_cleanup() (as part of path_lookupat() called by +do_tmpfile()), so doing that again can lead to double fput(). + +Fixes CVE-2015-5706. +Upstream-Status: Backport + +Cc: stable@vger.kernel.org # v3.11+ +Signed-off-by: Al Viro +Signed-off-by: Sona Sarmadi +--- + fs/namei.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/fs/namei.c b/fs/namei.c +index f67cf6c..fe30d3b 100644 +--- a/fs/namei.c ++++ b/fs/namei.c +@@ -3233,7 +3233,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, + + if (unlikely(file->f_flags & __O_TMPFILE)) { + error = do_tmpfile(dfd, pathname, nd, flags, op, file, &opened); +- goto out; ++ goto out2; + } + + error = path_init(dfd, pathname, flags, nd); +@@ -3263,6 +3263,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, + } + out: + path_cleanup(nd); ++out2: + if (!(opened & FILE_OPENED)) { + BUG_ON(!error); + put_filp(file); +-- +cgit v0.11.2 + diff --git a/recipes-kernel/linux/linux-hierofalcon_3.19.bb b/recipes-kernel/linux/linux-hierofalcon_3.19.bb index ea80e94..5e11c05 100644 --- a/recipes-kernel/linux/linux-hierofalcon_3.19.bb +++ b/recipes-kernel/linux/linux-hierofalcon_3.19.bb @@ -22,6 +22,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19;branch="standard/qemuarm6 file://fs-CVE-2015-3339.patch \ file://mnt-CVE-2015-4177.patch \ file://fs_pin-CVE-2015-4178.patch \ + file://fs-CVE-2015-5706.patch \ " S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf