diff options
| author | Eugene Shatokhin <eugene.shatokhin@rosalab.ru> | 2012-11-08 15:11:11 -0500 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2013-06-10 11:43:13 +0200 |
| commit | 5d0735ba9c2f8a2e2b03b33bfa1de1840209d2e9 (patch) | |
| tree | d9cd8102a1c9d1f43dd3cc3fe619accb971a58f8 /fs/ext4 | |
| parent | 352585523cea4cad8a77c441f7e50ed18a99a466 (diff) | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'fs/ext4')
| -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 0df88b2a69b0..d29a06b645cc 100644 --- a/fs/ext4/acl.c +++ b/fs/ext4/acl.c @@ -454,8 +454,10 @@ ext4_xattr_set_acl(struct inode *inode, int type, 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)) |