linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Omar Sandoval <osandov@osandov.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
	Christoph Hellwig <hch@lst.de>,
	linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Omar Sandoval <osandov@osandov.com>
Subject: [PATCH] posix_acl: fix reference leaks in posix_acl_create
Date: Mon, 26 Jan 2015 22:16:53 -0800	[thread overview]
Message-ID: <0d8672e771b8fc1fef94db4b40b418afc8763c2b.1422338890.git.osandov@osandov.com> (raw)

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(-)

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;
-- 
2.2.2


             reply	other threads:[~2015-01-27  6:17 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-27  6:16 Omar Sandoval [this message]
2015-01-28 17:09 ` [PATCH] posix_acl: fix reference leaks in posix_acl_create Christoph Hellwig
2015-02-02  7:55   ` Omar Sandoval
2015-02-02 14:19     ` Christoph Hellwig
2015-02-09  5:45       ` [PATCH v2] " Omar Sandoval

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0d8672e771b8fc1fef94db4b40b418afc8763c2b.1422338890.git.osandov@osandov.com \
    --to=osandov@osandov.com \
    --cc=hch@lst.de \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).