Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 24ec19b0ae83a385ad9c55520716da671274b96c

Authored by Eugene Shatokhin
Committed by Theodore Ts'o
1 parent 8b0f165f79
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ext4: fix memory leak in ext4_xattr_set_acl()'s error path 

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>
Cc: stable@vger.kernel.org

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

... ... @@ -423,8 +423,10 @@
423 423  
424 424 retry:
425 425 handle = ext4_journal_start(inode, EXT4_DATA_TRANS_BLOCKS(inode->i_sb));
426   - if (IS_ERR(handle))
427   - return PTR_ERR(handle);
  426 + if (IS_ERR(handle)) {
  427 + error = PTR_ERR(handle);
  428 + goto release_and_out;
  429 + }
428 430 error = ext4_set_acl(handle, inode, type, acl);
429 431 ext4_journal_stop(handle);
430 432 if (error == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))