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 <[email protected]> Signed-off-by: Eugene Shatokhin <[email protected]> Signed-off-by: "Theodore Ts'o" <[email protected]> Cc: [email protected]
zehome · Nov 8, 2012 · 24ec19b · 24ec19b
1 parent 8b0f165
commit 24ec19b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
@@ -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))