On Mon, Dec 07, 2015 at 04:39:15PM +0800, Qu Wenruo wrote:
> Enhance btrfs_check_super_valid() function by the following points:
> 1) Restrict sector/node size check
> Not the old max/min valid check, but also check if it's a power of 2.
> So some bogus number like 12K nodesize won't pass now.
>
> 2) Super flag check
> Except some common one like WRITTEN and RELOC, and other one used in
> btrfs-progs, unrecognized flag will cause btrfs refuse to mount.
>
> 3) Better root alignment check
> Now root bytenr is checked against sectorsize.
>
> 4) Move some check into btrfs_check_super_valid().
> Like nodesize vs leafsize check, and PAGESIZE vs sectorsize check.
> And MAGIC check.
>
> Reported-by: Vegard Nossum <[email protected]>
> Signed-off-by: Qu Wenruo <[email protected]>
Good, the code is better structured now, eg. the sb magic check came too
late before.
> @@ -4005,31 +3993,47 @@ static int btrfs_check_super_valid(struct
> btrfs_fs_info *fs_info,
> }
>
> /*
> - * The common minimum, we don't know if we can trust the
> nodesize/sectorsize
> - * items yet, they'll be verified later. Issue just a warning.
> + * Check sectorsize and nodesize first, some other check will need it.
> + * XXX: Just do a favor for later subpage size check. Check all
Please do not add new XXX or TODO markers to the sources. The comment
would be fine with just:
"Check all possible sectorsizes (4K, 8K, 16K, 32K, 64K) here."
With that fixed,
Reviewed-by: David Sterba <[email protected]>
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
