]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ext4: fix memory leak in ext4_free_branches
authorTheodore Ts'o <tytso@mit.edu>
Mon, 10 Jan 2011 17:51:28 +0000 (12:51 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 23:14:20 +0000 (15:14 -0800)
commit 1c5b9e9065567876c2d4a7a16d78f0fed154a5bf upstream.

Commit 40389687 moved a call to ext4_forget() out of
ext4_free_branches and let ext4_free_blocks() handle calling
bforget().  But that change unfortunately did not replace the call to
ext4_forget() with brelse(), which was needed to drop the in-use count
of the indirect block's buffer head, which lead to a memory leak when
deleting files that used indirect blocks.  Fix this.

Thanks to Hugh Dickins for pointing this out.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/ext4/inode.c

index e659597b690b508e1325182de702031a73843f4d..97a28e9d4625bc2898c45962974cf411bc77ff67 100644 (file)
@@ -4349,6 +4349,7 @@ static void ext4_free_branches(handle_t *handle, struct inode *inode,
                                        (__le32 *) bh->b_data,
                                        (__le32 *) bh->b_data + addr_per_block,
                                        depth);
+                       brelse(bh);
 
                        /*
                         * Everything below this this pointer has been