From: Omar Sandoval <osandov@osandov.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] posix_acl: fix reference leaks in posix_acl_create
Date: Sun, 1 Feb 2015 23:55:02 -0800 [thread overview]
Message-ID: <20150202075502.GA24678@mew> (raw)
In-Reply-To: <20150128170952.GB17528@lst.de>
On Wed, Jan 28, 2015 at 06:09:52PM +0100, Christoph Hellwig wrote:
> 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.
Hi, Christoph,
There are already a couple of return paths in posix_acl_create, and
there are only these two error cases, so I think gotos might actually
make the code more confusing. In any case, here's an idea:
posix_acl: fix reference leaks in posix_acl_create
get_acl gets a reference which we must release in the error cases.
Signed-off-by: Omar Sandoval <osandov@osandov.com>
diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 0855f77..515d315 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -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);
--
Omar
next prev parent reply other threads:[~2015-02-02 7:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-27 6:16 [PATCH] posix_acl: fix reference leaks in posix_acl_create Omar Sandoval
2015-01-28 17:09 ` Christoph Hellwig
2015-02-02 7:55 ` Omar Sandoval [this message]
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=20150202075502.GA24678@mew \
--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).