From 581646b94f3b57a461105968b49105a1357216ea Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Mon, 7 Oct 2013 09:51:35 -0400 Subject: [PATCH] libext2fs: ind_punch() must not stop examining blocks prematurely When we're iterating the main loop in ind_punch(), "offset" tracks how far we've progressed into the block map, "start" tells us where to start punching, and "count" tells us how many blocks we are to punch after "start". Therefore, we would like to break out of the loop once the "offset" that we're looking at has progressed past the end of the punch range. Unfortunately, if start !=0, the if-break clause in the loop causes us to break out of the loop early. Therefore, change the breakout test to terminate the loop at the correct time. Signed-off-by: Darrick J. Wong Signed-off-by: "Theodore Ts'o" --- lib/ext2fs/punch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ext2fs/punch.c b/lib/ext2fs/punch.c index aac194228..092940042 100644 --- a/lib/ext2fs/punch.c +++ b/lib/ext2fs/punch.c @@ -60,7 +60,7 @@ static errcode_t ind_punch(ext2_filsys fs, struct ext2_inode *inode, #endif incr = 1 << ((EXT2_BLOCK_SIZE_BITS(fs->super)-2)*level); for (i=0, offset=0; i < max; i++, p++, offset += incr) { - if (offset > count) + if (offset >= start + count) break; if (*p == 0 || (offset+incr) <= start) continue; -- 2.47.2