From: David Sterba <dsterba@suse.com>
Date: Mon, 30 Jan 2017 15:58:57 +0000 (+0100)
Subject: btrfs-progs: convert: better error handling in ext2_read_used_space
X-Git-Tag: upstream/4.16.1~815
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9368a774560c8c913c46f7cdf36bb11da5688338;p=platform%2Fupstream%2Fbtrfs-progs.git

btrfs-progs: convert: better error handling in ext2_read_used_space

Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/convert/source-ext2.c b/convert/source-ext2.c
index f286d07..29222a3 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)