summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-04-21 17:57:36 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-04-21 17:57:35 -0700
commit0fc565ebdb0315d7d21b011074963bbe626fe440 (patch)
treea1eed5f0b8d84f1fbb802cb6e747282e6999f970
parent038de1e53d6f37a1cbb0108e856ad384c0060da8 (diff)
parentbea6f1c7796da9d18404fdea08625644ba6fb73a (diff)
Merge "FROMLIST: 9p: fix a potential acl leak"
-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 929b618da43b..c30c6ceac2c4 100644
--- a/fs/9p/acl.c
+++ b/fs/9p/acl.c
@@ -283,6 +283,7 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler,
case ACL_TYPE_ACCESS:
if (acl) {
struct iattr iattr;
+ struct posix_acl *old_acl = acl;
retval = posix_acl_update_mode(inode, &iattr.ia_mode, &acl);
if (retval)
@@ -293,6 +294,7 @@ static int v9fs_xattr_set_acl(const struct xattr_handler *handler,
* by the mode bits. So don't
* update ACL.
*/
+ posix_acl_release(old_acl);
value = NULL;
size = 0;
}