Re: [PATCH 1/2] btrfs-progs: btrfs-convert: Prevent accounting blocks beyond end of device
From: Qu Wenruo <hidden>
Date: 2016-12-09 01:04:06
Hi Chandan, Thanks for the patch. At 12/08/2016 09:56 PM, Chandan Rajendra wrote:
When looping across data block bitmap, __ext2_add_one_block() may add blocks which do not exist on the underlying disk. This commit prevents this from happening by checking the block index against the maximum block count that was present in the ext4 filesystem instance that is being converted.
The patch looks good to me. Reviewed-by: Qu Wenruo <redacted> Just curious about if such image can pass e2fsck. And would you please upload a minimal image as btrfs-progs test case? Thanks, Qu
quoted hunk ↗ jump to hunk
Signed-off-by: Chandan Rajendra <redacted> --- convert/main.c | 3 +++ 1 file changed, 3 insertions(+)diff --git a/convert/main.c b/convert/main.c index 4b4cea4..1148a36 100644 --- a/convert/main.c +++ b/convert/main.c@@ -1525,6 +1525,9 @@ static int __ext2_add_one_block(ext2_filsys fs, char *bitmap, offset /= EXT2FS_CLUSTER_RATIO(fs); offset += group_nr * EXT2_CLUSTERS_PER_GROUP(fs->super); for (i = 0; i < EXT2_CLUSTERS_PER_GROUP(fs->super); i++) { + if ((i + offset) >= ext2fs_blocks_count(fs->super)) + break; + if (ext2fs_test_bit(i, bitmap)) { u64 start;