]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
posix_acl: fix reference leaks in posix_acl_create
authorOmar Sandoval <osandov@osandov.com>
Mon, 9 Feb 2015 05:45:25 +0000 (21:45 -0800)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 20 Feb 2015 09:56:45 +0000 (04:56 -0500)
get_acl gets a reference which we must release in the error cases.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Omar Sandoval <osandov@osandov.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/posix_acl.c

index 0855f772cd41599d6c1d1091e7da616d32cccf53..515d31511d0d7712faf7b304ebbdc45ee8f2b4d8 100644 (file)
@@ -564,13 +564,11 @@ posix_acl_create(struct inode *dir, umode_t *mode,
 
        *acl = posix_acl_clone(p, GFP_NOFS);
        if (!*acl)
-               return -ENOMEM;
+               goto no_mem;
 
        ret = posix_acl_create_masq(*acl, mode);
-       if (ret < 0) {
-               posix_acl_release(*acl);
-               return -ENOMEM;
-       }
+       if (ret < 0)
+               goto no_mem_clone;
 
        if (ret == 0) {
                posix_acl_release(*acl);
@@ -591,6 +589,12 @@ no_acl:
        *default_acl = NULL;
        *acl = NULL;
        return 0;
+
+no_mem_clone:
+       posix_acl_release(*acl);
+no_mem:
+       posix_acl_release(p);
+       return -ENOMEM;
 }
 EXPORT_SYMBOL_GPL(posix_acl_create);