From 407febe349d56b2a69dcf65fc448273e11dc924b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 8 May 2017 09:42:23 +0200 Subject: [PATCH] 3.18-stable patches added patches: 9p-fix-a-potential-acl-leak.patch --- queue-3.18/9p-fix-a-potential-acl-leak.patch | 48 ++++++++++++++++++++ queue-3.18/series | 1 + queue-4.10/series | 1 + queue-4.4/series | 1 + queue-4.9/series | 1 + 5 files changed, 52 insertions(+) create mode 100644 queue-3.18/9p-fix-a-potential-acl-leak.patch create mode 100644 queue-3.18/series create mode 100644 queue-4.10/series create mode 100644 queue-4.4/series create mode 100644 queue-4.9/series 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 +Date: Wed, 22 Feb 2017 15:40:53 -0800 +Subject: 9p: fix a potential acl leak + +From: Cong Wang + +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 +Reported-by: Mark Salyzyn +Reviewed-by: Jan Kara +Reviewed-by: Greg Kurz +Cc: Eric Van Hensbergen +Cc: Ron Minnich +Cc: Latchesar Ionkov +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + 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 -- 2.47.3