From: Qu Wenruo Date: Tue, 21 Feb 2017 08:34:30 +0000 (+0800) Subject: btrfs-progs: check: lowmem: Fix extent item size false alert X-Git-Tag: upstream/4.16.1~738 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4a749360cdb55d196750bd7ea3591a3db7f90843;p=platform%2Fupstream%2Fbtrfs-progs.git btrfs-progs: check: lowmem: Fix extent item size false alert If one extent item has no inline ref, btrfs lowmem mode check can give false alert without outputting any error message. The problem is lowmem mode always assumes that extent item has inline refs, and when it encounters such case it flags the extent item has wrong size, but doesn't output the error message. Although we already have such image submitted, at the commit time due to another bug in cmds-check return value, it doesn't detect it until that bug is fixed. Signed-off-by: Qu Wenruo Signed-off-by: David Sterba --- diff --git a/cmds-check.c b/cmds-check.c index 1f75157..29c532b 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -10743,13 +10743,20 @@ static int check_extent_item(struct btrfs_fs_info *fs_info, } end = (unsigned long)ei + item_size; - if (ptr >= end) { +next: + /* Reached extent item end normally */ + if (ptr == end) + goto out; + + /* Beyond extent item end, wrong item size */ + if (ptr > end) { err |= ITEM_SIZE_MISMATCH; + error("extent item at bytenr %llu slot %d has wrong size", + eb->start, slot); goto out; } /* Now check every backref in this extent item */ -next: iref = (struct btrfs_extent_inline_ref *)ptr; type = btrfs_extent_inline_ref_type(eb, iref); offset = btrfs_extent_inline_ref_offset(eb, iref); @@ -10786,8 +10793,7 @@ next: } ptr += btrfs_extent_inline_ref_size(type); - if (ptr < end) - goto next; + goto next; out: return err;