aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorCong Wang <xiyou.wangcong@gmail.com>2017-02-22 18:40:53 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-14 08:00:13 -0400
commitf5ca890f138d010e26a56e622316d4065add67f0 (patch)
tree9c439c9521fb57eb660f92d4558d0ca82b6a0fc1 /fs
parent89f3b8d5f264d5dab9818c6667c71e3cc55b13f5 (diff)
9p: fix a potential acl leak
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/9p/acl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/9p/acl.c b/fs/9p/acl.c
index b3c2cc79c20d..082d227fa56b 100644
--- a/fs/9p/acl.c
+++ b/fs/9p/acl.c
@@ -277,6 +277,7 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler,
277 case ACL_TYPE_ACCESS: 277 case ACL_TYPE_ACCESS:
278 if (acl) { 278 if (acl) {
279 struct iattr iattr; 279 struct iattr iattr;
280 struct posix_acl *old_acl = acl;
280 281
281 retval = posix_acl_update_mode(inode, &iattr.ia_mode, &acl); 282 retval = posix_acl_update_mode(inode, &iattr.ia_mode, &acl);
282 if (retval) 283 if (retval)
@@ -287,6 +288,7 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler,
287 * by the mode bits. So don't 288 * by the mode bits. So don't
288 * update ACL. 289 * update ACL.
289 */ 290 */
291 posix_acl_release(old_acl);
290 value = NULL; 292 value = NULL;
291 size = 0; 293 size = 0;
292 } 294 }