* [PATCH] ext4: fix possible memory leak in ext4_xattr_set_acl()
@ 2012-10-08 11:11 Eugene Shatokhin
2012-10-08 12:36 ` Lukáš Czerner
2012-11-08 20:11 ` Theodore Ts'o
0 siblings, 2 replies; 3+ messages in thread
From: Eugene Shatokhin @ 2012-10-08 11:11 UTC (permalink / raw)
To: linux-ext4; +Cc: Eugene Shatokhin
In ext4_xattr_set_acl(), if ext4_journal_start() returns an error,
posix_acl_release() will not be called for 'acl' which may result
in a memory leak.
This patch fixes that.
Signed-off-by: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
---
fs/ext4/acl.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
index a5c29bb..8535c45 100644
--- a/fs/ext4/acl.c
+++ b/fs/ext4/acl.c
@@ -410,8 +410,10 @@ ext4_xattr_set_acl(struct dentry *dentry, const char *name, const void *value,
retry:
handle = ext4_journal_start(inode, EXT4_DATA_TRANS_BLOCKS(inode->i_sb));
- if (IS_ERR(handle))
- return PTR_ERR(handle);
+ if (IS_ERR(handle)) {
+ error = PTR_ERR(handle);
+ goto release_and_out;
+ }
error = ext4_set_acl(handle, inode, type, acl);
ext4_journal_stop(handle);
if (error == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ext4: fix possible memory leak in ext4_xattr_set_acl()
2012-10-08 11:11 [PATCH] ext4: fix possible memory leak in ext4_xattr_set_acl() Eugene Shatokhin
@ 2012-10-08 12:36 ` Lukáš Czerner
2012-11-08 20:11 ` Theodore Ts'o
1 sibling, 0 replies; 3+ messages in thread
From: Lukáš Czerner @ 2012-10-08 12:36 UTC (permalink / raw)
To: Eugene Shatokhin; +Cc: linux-ext4
On Mon, 8 Oct 2012, Eugene Shatokhin wrote:
> Date: Mon, 8 Oct 2012 15:11:12 +0400
> From: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
> To: linux-ext4@vger.kernel.org
> Cc: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
> Subject: [PATCH] ext4: fix possible memory leak in ext4_xattr_set_acl()
>
> In ext4_xattr_set_acl(), if ext4_journal_start() returns an error,
> posix_acl_release() will not be called for 'acl' which may result
> in a memory leak.
>
> This patch fixes that.
>
> Signed-off-by: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
> ---
> fs/ext4/acl.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
> index a5c29bb..8535c45 100644
> --- a/fs/ext4/acl.c
> +++ b/fs/ext4/acl.c
> @@ -410,8 +410,10 @@ ext4_xattr_set_acl(struct dentry *dentry, const char *name, const void *value,
>
> retry:
> handle = ext4_journal_start(inode, EXT4_DATA_TRANS_BLOCKS(inode->i_sb));
> - if (IS_ERR(handle))
> - return PTR_ERR(handle);
> + if (IS_ERR(handle)) {
> + error = PTR_ERR(handle);
> + goto release_and_out;
> + }
> error = ext4_set_acl(handle, inode, type, acl);
> ext4_journal_stop(handle);
> if (error == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
>
Looks good.
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Thanks for catching that.
-Lukas
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ext4: fix possible memory leak in ext4_xattr_set_acl()
2012-10-08 11:11 [PATCH] ext4: fix possible memory leak in ext4_xattr_set_acl() Eugene Shatokhin
2012-10-08 12:36 ` Lukáš Czerner
@ 2012-11-08 20:11 ` Theodore Ts'o
1 sibling, 0 replies; 3+ messages in thread
From: Theodore Ts'o @ 2012-11-08 20:11 UTC (permalink / raw)
To: Eugene Shatokhin; +Cc: linux-ext4
On Mon, Oct 08, 2012 at 03:11:12PM +0400, Eugene Shatokhin wrote:
> In ext4_xattr_set_acl(), if ext4_journal_start() returns an error,
> posix_acl_release() will not be called for 'acl' which may result
> in a memory leak.
>
> This patch fixes that.
>
> Signed-off-by: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Thanks, applied.
- Ted
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-08 22:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-08 11:11 [PATCH] ext4: fix possible memory leak in ext4_xattr_set_acl() Eugene Shatokhin
2012-10-08 12:36 ` Lukáš Czerner
2012-11-08 20:11 ` Theodore Ts'o
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).