2012-10-08 11:22:37

by Eugene Shatokhin

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 <[email protected]>
---
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

2012-10-08 12:36:37

by Lukas Czerner

Subject: Re: [PATCH] ext4: fix possible memory leak in ext4_xattr_set_acl()

On Mon, 8 Oct 2012, Eugene Shatokhin wrote:

> Date: Mon, 8 Oct 2012 15:11:12 +0400
> From: Eugene Shatokhin <[email protected]>
> To: [email protected]
> Cc: Eugene Shatokhin <[email protected]>
> 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 <[email protected]>
> ---
> 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 <[email protected]>

Thanks for catching that.
-Lukas

2012-11-08 22:21:02

by Theodore Ts'o

Subject: Re: [PATCH] ext4: fix possible memory leak in ext4_xattr_set_acl()

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 <[email protected]>

Thanks, applied.

- Ted