diff mbox

posix_acl: fix reference leaks in posix_acl_create

Message ID 0d8672e771b8fc1fef94db4b40b418afc8763c2b.1422338890.git.osandov@osandov.com (mailing list archive)
State New, archived
Headers show

Commit Message

Omar Sandoval Jan. 27, 2015, 6:16 a.m. UTC 
get_acl gets a reference which we must release in the error cases.

Signed-off-by: Omar Sandoval <osandov@osandov.com>
---
 fs/posix_acl.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Christoph Hellwig Jan. 28, 2015, 5:09 p.m. UTC | #1 
On Mon, Jan 26, 2015 at 10:16:53PM -0800, Omar Sandoval wrote:
> get_acl gets a reference which we must release in the error cases.
> 
> Signed-off-by: Omar Sandoval <osandov@osandov.com>

Looks good, but at this point goto-based unwinding might be in order.
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 0855f77..f8f3cc2 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -555,28 +555,31 @@  posix_acl_create(struct inode *dir, umode_t *mode,
 	p = get_acl(dir, ACL_TYPE_DEFAULT);
 	if (IS_ERR(p)) {
 		if (p == ERR_PTR(-EOPNOTSUPP))
 			goto apply_umask;
 		return PTR_ERR(p);
 	}
 
 	if (!p)
 		goto apply_umask;
 
 	*acl = posix_acl_clone(p, GFP_NOFS);
-	if (!*acl)
+	if (!*acl) {
+		posix_acl_release(p);
 		return -ENOMEM;
+	}
 
 	ret = posix_acl_create_masq(*acl, mode);
 	if (ret < 0) {
 		posix_acl_release(*acl);
+		posix_acl_release(p);
 		return -ENOMEM;
 	}
 
 	if (ret == 0) {
 		posix_acl_release(*acl);
 		*acl = NULL;
 	}
 
 	if (!S_ISDIR(*mode)) {
 		posix_acl_release(p);
 		*default_acl = NULL;