From 8f4dae8fb7ae74e4ae7087712cb44492e294e6b0 Mon Sep 17 00:00:00 2001 From: Adrian Stratulat Date: Tue, 28 May 2019 11:42:57 +0200 Subject: linux-qoriq: CVE-2019-8980 References: https://nvd.nist.gov/vuln/detail/CVE-2019-8980 https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f612acfae86af7ecad754ae6a46019be9da05b8e Change-Id: I8aee55ac3d56dc610ac4eeaca7d0d099df418886 Signed-off-by: Adrian Stratulat --- patches/cve/4.14.x.scc | 1 + patches/cve/CVE-2019-8980.patch | 52 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 patches/cve/4.14.x.scc create mode 100644 patches/cve/CVE-2019-8980.patch diff --git a/patches/cve/4.14.x.scc b/patches/cve/4.14.x.scc new file mode 100644 index 0000000..b41503c --- /dev/null +++ b/patches/cve/4.14.x.scc @@ -0,0 +1 @@ +patch CVE-2019-8980.patch diff --git a/patches/cve/CVE-2019-8980.patch b/patches/cve/CVE-2019-8980.patch new file mode 100644 index 0000000..d5bdddc --- /dev/null +++ b/patches/cve/CVE-2019-8980.patch @@ -0,0 +1,52 @@ +From f612acfae86af7ecad754ae6a46019be9da05b8e Mon Sep 17 00:00:00 2001 +From: YueHaibing +Date: Tue, 19 Feb 2019 10:10:38 +0800 +Subject: exec: Fix mem leak in kernel_read_file + +syzkaller report this: +BUG: memory leak +unreferenced object 0xffffc9000488d000 (size 9195520): + comm "syz-executor.0", pid 2752, jiffies 4294787496 (age 18.757s) + hex dump (first 32 bytes): + ff ff ff ff ff ff ff ff a8 00 00 00 01 00 00 00 ................ + 02 00 00 00 00 00 00 00 80 a1 7a c1 ff ff ff ff ..........z..... + backtrace: + [<000000000863775c>] __vmalloc_node mm/vmalloc.c:1795 [inline] + [<000000000863775c>] __vmalloc_node_flags mm/vmalloc.c:1809 [inline] + [<000000000863775c>] vmalloc+0x8c/0xb0 mm/vmalloc.c:1831 + [<000000003f668111>] kernel_read_file+0x58f/0x7d0 fs/exec.c:924 + [<000000002385813f>] kernel_read_file_from_fd+0x49/0x80 fs/exec.c:993 + [<0000000011953ff1>] __do_sys_finit_module+0x13b/0x2a0 kernel/module.c:3895 + [<000000006f58491f>] do_syscall_64+0x147/0x600 arch/x86/entry/common.c:290 + [<00000000ee78baf4>] entry_SYSCALL_64_after_hwframe+0x49/0xbe + [<00000000241f889b>] 0xffffffffffffffff + +It should goto 'out_free' lable to free allocated buf while kernel_read +fails. + +Fixes: 39d637af5aa7 ("vfs: forbid write access when reading a file into memory") +Signed-off-by: YueHaibing +Signed-off-by: Al Viro +Signed-off-by: Adrian Stratulat +Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f612acfae86af7ecad754ae6a46019be9da05b8e] +CVE: CVE-2019-8980 +--- + fs/exec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/exec.c b/fs/exec.c +index fb72d36f7823..bcf383730bea 100644 +--- a/fs/exec.c ++++ b/fs/exec.c +@@ -932,7 +932,7 @@ int kernel_read_file(struct file *file, void **buf, loff_t *size, + bytes = kernel_read(file, *buf + pos, i_size - pos, &pos); + if (bytes < 0) { + ret = bytes; +- goto out; ++ goto out_free; + } + + if (bytes == 0) +-- +cgit 1.2-0.3.lf.el7 + -- cgit v1.2.3-54-g00ecf