[ 3.5.y.z extended stable ] Patch "ext4: fix memory leak in ext4_xattr_set_acl()'s error path" has been added to staging queue
Herton Ronaldo Krzesinski
herton.krzesinski at canonical.com
Mon Jan 7 20:32:44 UTC 2013
This is a note to let you know that I have just added a patch titled
ext4: fix memory leak in ext4_xattr_set_acl()'s error path
to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree
which can be found at:
http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Herton
------
>From 74d45b43f6403f2a0ddf48889c31ae6c3734be42 Mon Sep 17 00:00:00 2001
From: Eugene Shatokhin <eugene.shatokhin at rosalab.ru>
Date: Thu, 8 Nov 2012 15:11:11 -0500
Subject: [PATCH] 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 at redhat.com>
Signed-off-by: Eugene Shatokhin <eugene.shatokhin at rosalab.ru>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski at canonical.com>
---
fs/ext4/acl.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
index a5c29bb..8535c45 100644
--- a/fs/ext4/acl.c
+++ b/fs/ext4/acl.c
@@ -410,8 +410,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))
--
1.7.9.5
More information about the kernel-team
mailing list