From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 8 Mar 2019 12:46:26 +0000 (+0100)
Subject: 5.0-stable patches
X-Git-Tag: v5.0.1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0fa4a18656fbfaad789f8cf015510cfc4d13a70d;p=thirdparty%2Fkernel%2Fstable-queue.git

5.0-stable patches

added patches:
	exec-fix-mem-leak-in-kernel_read_file.patch
---

diff --git a/queue-5.0/exec-fix-mem-leak-in-kernel_read_file.patch b/queue-5.0/exec-fix-mem-leak-in-kernel_read_file.patch
new file mode 100644
index 00000000000..e63743d1f32
--- /dev/null
+++ b/queue-5.0/exec-fix-mem-leak-in-kernel_read_file.patch
@@ -0,0 +1,51 @@
+From f612acfae86af7ecad754ae6a46019be9da05b8e Mon Sep 17 00:00:00 2001
+From: YueHaibing <yuehaibing@huawei.com>
+Date: Tue, 19 Feb 2019 10:10:38 +0800
+Subject: exec: Fix mem leak in kernel_read_file
+
+From: YueHaibing <yuehaibing@huawei.com>
+
+commit f612acfae86af7ecad754ae6a46019be9da05b8e upstream.
+
+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 <yuehaibing@huawei.com>
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Cc: Thibaut Sautereau <thibaut@sautereau.fr>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/exec.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -932,7 +932,7 @@ int kernel_read_file(struct file *file,
+ 		bytes = kernel_read(file, *buf + pos, i_size - pos, &pos);
+ 		if (bytes < 0) {
+ 			ret = bytes;
+-			goto out;
++			goto out_free;
+ 		}
+ 
+ 		if (bytes == 0)
diff --git a/queue-5.0/series b/queue-5.0/series
index b84103a6bb1..5507389634f 100644
--- a/queue-5.0/series
+++ b/queue-5.0/series
@@ -43,3 +43,4 @@ revert-selftests-firmware-remove-use-of-non-standard-diff-z-option.patch
 selftests-firmware-fix-verify_reqs-return-value.patch
 bluetooth-btrtl-restore-old-logic-to-assume-firmware-is-already-loaded.patch
 bluetooth-fix-locking-in-bt_accept_enqueue-for-bh-context.patch
+exec-fix-mem-leak-in-kernel_read_file.patch