]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
btrfs: tree-checker: Enhance chunk checker to validate chunk profile
authorQu Wenruo <wqu@suse.com>
Wed, 13 Mar 2019 04:17:50 +0000 (12:17 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 10 Nov 2020 11:35:56 +0000 (12:35 +0100)
commit 80e46cf22ba0bcb57b39c7c3b52961ab3a0fd5f2 upstream.

Btrfs-progs already have a comprehensive type checker, to ensure there
is only 0 (SINGLE profile) or 1 (DUP/RAID0/1/5/6/10) bit set for chunk
profile bits.

Do the same work for kernel.

Reported-by: Yoon Jungyeon <jungyeon@gatech.edu>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=202765
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/btrfs/tree-checker.c

index a0222e6a11c542308ccfa562c64d26a7c66ef9b5..ab1553781e9ca076fcaf8103d2d60a8262c34a47 100644 (file)
@@ -556,6 +556,13 @@ int btrfs_check_chunk_valid(struct btrfs_fs_info *fs_info,
                return -EUCLEAN;
        }
 
+       if (!is_power_of_2(type & BTRFS_BLOCK_GROUP_PROFILE_MASK) &&
+           (type & BTRFS_BLOCK_GROUP_PROFILE_MASK) != 0) {
+               chunk_err(fs_info, leaf, chunk, logical,
+               "invalid chunk profile flag: 0x%llx, expect 0 or 1 bit set",
+                         type & BTRFS_BLOCK_GROUP_PROFILE_MASK);
+               return -EUCLEAN;
+       }
        if ((type & BTRFS_BLOCK_GROUP_TYPE_MASK) == 0) {
                chunk_err(fs_info, leaf, chunk, logical,
        "missing chunk type flag, have 0x%llx one bit must be set in 0x%llx",