]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ext4: fix memory leak in ext4_xattr_set_acl()'s error path
authorEugene Shatokhin <eugene.shatokhin@rosalab.ru>
Thu, 8 Nov 2012 20:11:11 +0000 (15:11 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 8 Nov 2012 20:11:11 +0000 (15:11 -0500)
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
fs/ext4/acl.c

index d3c5b88fd89f22f9061b4905b756445936e7076b..e6e0d988439bf20e4570f209e1b16b4ffdb18a21 100644 (file)
@@ -423,8 +423,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))