diff options
| author | Eugene Shatokhin <eugene.shatokhin@rosalab.ru> | 2012-11-08 15:11:11 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2014-02-10 16:11:28 -0500 |
| commit | 41d4b0bae2fffc6558ac846199caee5baa8dd7f2 (patch) | |
| tree | d0cdc582deb49f375b46fd37f6234dd06e578e66 | |
| parent | 3b73beed27b6ad3877b7257ae17419930b8ae90c (diff) | |
| download | linux-stable-41d4b0bae2fffc6558ac846199caee5baa8dd7f2.tar.gz linux-stable-41d4b0bae2fffc6558ac846199caee5baa8dd7f2.zip | |
ext4: fix memory leak in ext4_xattr_set_acl()'s error path
commit 24ec19b0ae83a385ad9c55520716da671274b96c upstream.
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.
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | fs/ext4/acl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c index 8a2a29d35a6f..f14fa786dad0 100644 --- a/fs/ext4/acl.c +++ b/fs/ext4/acl.c @@ -442,8 +442,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)) |