diff options
| author | Qu Wenruo <wqu@suse.com> | 2018-07-09 14:50:53 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-08-06 15:02:59 +0200 |
| commit | b6582421edb351fe6cd02f1d267d934aceae1ae8 (patch) | |
| tree | dd976ad93ff1fad01f840d632c2de6373ff73bd4 | |
| parent | 677acdf53484a573a6c5860e0e27db51b2d00247 (diff) | |
btrfs-progs: Exit gracefully when overlapping chunks are detected
BUG_ON() can be triggered if some image contains overlappin chunks.
volumes.c:1930: read_one_chunk: BUG_ON `ret` triggered, value -17
btrfs(+0x2cf12)[0x5601efa17f12]
btrfs(+0x2fd8b)[0x5601efa1ad8b]
btrfs(btrfs_read_chunk_tree+0x2bf)[0x5601efa1b30f]
btrfs(btrfs_setup_chunk_tree_and_device_map+0xe8)[0x5601efa07718]
btrfs(+0x1c944)[0x5601efa07944]
btrfs(open_ctree_fs_info+0x90)[0x5601efa07b90]
btrfs(cmd_check+0x4d7)[0x5601efa4f8c7]
btrfs(main+0x88)[0x5601ef9fd768]
/usr/lib/libc.so.6(__libc_start_main+0xeb)[0x7f3c7787306b]
btrfs(_start+0x2a)[0x5601ef9fd88a]
Extent cache code can already detect it without problems, we only need
to remove the BUG_ON() and exit gracefully.
Reported-by: Xu Wen <wen.xu@gatech.edu>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=200409
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | volumes.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1924,9 +1924,12 @@ static int read_one_chunk(struct btrfs_fs_info *fs_info, struct btrfs_key *key, } ret = insert_cache_extent(&map_tree->cache_tree, &map->ce); - BUG_ON(ret); + if (ret < 0) { + error("failed to add chunk map start=%llu len=%llu: %d (%s)", + map->ce.start, map->ce.size, ret, strerror(-ret)); + } - return 0; + return ret; } static int fill_device_from_item(struct extent_buffer *leaf, |