From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 8 May 2017 07:42:23 +0000 (+0200)
Subject: 3.18-stable patches
X-Git-Tag: v4.4.68~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=407febe349d56b2a69dcf65fc448273e11dc924b;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

added patches:
	9p-fix-a-potential-acl-leak.patch
---

diff --git a/queue-3.18/9p-fix-a-potential-acl-leak.patch b/queue-3.18/9p-fix-a-potential-acl-leak.patch
new file mode 100644
index 00000000000..f1876dfbf60
--- /dev/null
+++ b/queue-3.18/9p-fix-a-potential-acl-leak.patch
@@ -0,0 +1,48 @@
+From b5c66bab72a6a65edb15beb60b90d3cb84c5763b Mon Sep 17 00:00:00 2001
+From: Cong Wang <xiyou.wangcong@gmail.com>
+Date: Wed, 22 Feb 2017 15:40:53 -0800
+Subject: 9p: fix a potential acl leak
+
+From: Cong Wang <xiyou.wangcong@gmail.com>
+
+commit b5c66bab72a6a65edb15beb60b90d3cb84c5763b upstream.
+
+posix_acl_update_mode() could possibly clear 'acl', if so we leak the
+memory pointed by 'acl'.  Save this pointer before calling
+posix_acl_update_mode() and release the memory if 'acl' really gets
+cleared.
+
+Link: http://lkml.kernel.org/r/1486678332-2430-1-git-send-email-xiyou.wangcong@gmail.com
+Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
+Reported-by: Mark Salyzyn <salyzyn@android.com>
+Reviewed-by: Jan Kara <jack@suse.cz>
+Reviewed-by: Greg Kurz <groug@kaod.org>
+Cc: Eric Van Hensbergen <ericvh@gmail.com>
+Cc: Ron Minnich <rminnich@sandia.gov>
+Cc: Latchesar Ionkov <lucho@ionkov.net>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/9p/acl.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/fs/9p/acl.c
++++ b/fs/9p/acl.c
+@@ -321,6 +321,7 @@ static int v9fs_xattr_set_acl(struct den
+ 		name = POSIX_ACL_XATTR_ACCESS;
+ 		if (acl) {
+ 			struct iattr iattr;
++			struct posix_acl *old_acl = acl;
+ 
+ 			retval = posix_acl_update_mode(inode, &iattr.ia_mode, &acl);
+ 			if (retval)
+@@ -331,6 +332,7 @@ static int v9fs_xattr_set_acl(struct den
+ 				 * by the mode bits. So don't
+ 				 * update ACL.
+ 				 */
++				posix_acl_release(old_acl);
+ 				value = NULL;
+ 				size = 0;
+ 			}
diff --git a/queue-3.18/series b/queue-3.18/series
new file mode 100644
index 00000000000..206ed5f901d
--- /dev/null
+++ b/queue-3.18/series
@@ -0,0 +1 @@
+9p-fix-a-potential-acl-leak.patch
diff --git a/queue-4.10/series b/queue-4.10/series
new file mode 100644
index 00000000000..206ed5f901d
--- /dev/null
+++ b/queue-4.10/series
@@ -0,0 +1 @@
+9p-fix-a-potential-acl-leak.patch
diff --git a/queue-4.4/series b/queue-4.4/series
new file mode 100644
index 00000000000..206ed5f901d
--- /dev/null
+++ b/queue-4.4/series
@@ -0,0 +1 @@
+9p-fix-a-potential-acl-leak.patch
diff --git a/queue-4.9/series b/queue-4.9/series
new file mode 100644
index 00000000000..206ed5f901d
--- /dev/null
+++ b/queue-4.9/series
@@ -0,0 +1 @@
+9p-fix-a-potential-acl-leak.patch