From 9368a774560c8c913c46f7cdf36bb11da5688338 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Mon, 30 Jan 2017 16:58:57 +0100 Subject: btrfs-progs: convert: better error handling in ext2_read_used_space Signed-off-by: David Sterba --- convert/source-ext2.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/convert/source-ext2.c b/convert/source-ext2.c index f286d074..29222a37 100644 --- a/convert/source-ext2.c +++ b/convert/source-ext2.c @@ -136,8 +136,11 @@ static int ext2_read_used_space(struct btrfs_convert_context *cctx) int ret = 0; block_nbytes = EXT2_CLUSTERS_PER_GROUP(fs->super) / 8; - /* Shouldn't happen */ - BUG_ON(!fs->block_map); + if (!block_nbytes) { + error("EXT2_CLUSTERS_PER_GROUP too small: %llu", + (unsigned long long)(EXT2_CLUSTERS_PER_GROUP(fs->super))); + return -EINVAL; + } block_bitmap = malloc(block_nbytes); if (!block_bitmap) -- cgit v1.2.3