ANDROID: fix acl leaks

Fixes regressions associated with commit
073931017b49d9458aa351605b43a7e34598caef

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 32458736
Change-Id: I6ee127dfdf3594d24ccd8560541ac554c5b05eb6

diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index e7b330ef4dfdaaaf636254f304051f3f442cf6e5..db243db44038b532ab1b01b4bd40ff2a0f67fed1 100644 (file)
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -268,8 +268,11 @@ static int gfs2_xattr_system_set(struct dentry *dentry, const char *name,
 
        if (type == ACL_TYPE_ACCESS) {
                umode_t mode = inode->i_mode;
+               struct posix_acl *old_acl = acl;
                error = posix_acl_update_mode(inode, &inode->i_mode, &acl);
 
+               if (!acl)
+                       posix_acl_release(old_acl);
                if (error)
                        goto out_release;
 

diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
index c79b1d7a53e24be8c918313318b325b949997954..02bdfe007aa9f60b65b448682755a5021ae92fce 100644 (file)
--- a/fs/jfs/xattr.c
+++ b/fs/jfs/xattr.c
@@ -693,8 +693,9 @@ static int can_set_system_xattr(struct inode *inode, const char *name,
                        return rc;
                }
                if (acl) {
+                       struct posix_acl *old_acl = acl;
                        rc = posix_acl_update_mode(inode, &inode->i_mode, &acl);
-                       posix_acl_release(acl);
+                       posix_acl_release(old_acl);
                        if (rc) {
                                printk(KERN_ERR
                                       "posix_acl_update_mode returned %d\n",

diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c
index 4f8e4770229cf78e0659e241aa11902a11b3609b..eaa2a3735519ec7cb4b34a3f2138e170310632c6 100644 (file)
--- a/fs/xfs/xfs_acl.c
+++ b/fs/xfs/xfs_acl.c
@@ -389,7 +389,10 @@ xfs_xattr_acl_set(struct dentry *dentry, const char *name,
 
        if (type == ACL_TYPE_ACCESS) {
                umode_t mode = inode->i_mode;
+               struct posix_acl *old_acl = acl;
                error = posix_acl_update_mode(inode, &mode, &acl);
+               if (!acl)
+                       posix_acl_release(old_acl);
                if (error)
                        goto out_release;
                error = xfs_set_mode(inode, mode);