summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorErnesto A. Fernández <ernesto.mnd.fernandez@gmail.com>2017-06-23 21:37:21 -0300
committerJan Kara <jack@suse.cz>2017-07-13 13:45:08 +0200
commit4d9bcaddacf23861c5ee088b0c03e7034c3d59d6 (patch)
treee2a78e2ba45bf86d738e409ee1573822ddc36a11 /fs
parent08db141b5313ac2f64b844fb5725b8d81744b417 (diff)
downloadop-kernel-dev-4d9bcaddacf23861c5ee088b0c03e7034c3d59d6.zip
op-kernel-dev-4d9bcaddacf23861c5ee088b0c03e7034c3d59d6.tar.gz
ext2: Fix memory leak when truncate races ext2_get_blocks
Buffer heads referencing indirect blocks may not be released if the file is truncated at the right time. This happens because ext2_get_branch() returns NULL when it finds the whole chain of indirect blocks already set, and when truncate alters the chain this value of NULL is treated as the address of the last head to be released. Handle this in the same way as it's done after the got_it label. Signed-off-by: Ernesto A. Fernández <ernesto.mnd.fernandez@gmail.com> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext2/inode.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 2dcbd56..30163d0 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -659,6 +659,7 @@ static int ext2_get_blocks(struct inode *inode,
*/
err = -EAGAIN;
count = 0;
+ partial = chain + depth - 1;
break;
}
blk = le32_to_cpu(*(chain[depth-1].p + count));
OpenPOWER on IntegriCloud