This is a note to let you know that I've just added the patch titled btrfs: tree-checker: Enhance chunk checker to validate chunk profile to the 4.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: btrfs-tree-checker-enhance-chunk-checker-to-validate-chunk-profile.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Fri Nov 27 04:15:29 PM CET 2020 From: Qu Wenruo <wqu@xxxxxxxx> Date: Wed, 13 Mar 2019 12:17:50 +0800 Subject: btrfs: tree-checker: Enhance chunk checker to validate chunk profile From: Qu Wenruo <wqu@xxxxxxxx> 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@xxxxxxxxxx> Link: https://bugzilla.kernel.org/show_bug.cgi?id=202765 Reviewed-by: Nikolay Borisov <nborisov@xxxxxxxx> Reviewed-by: Johannes Thumshirn <jthumshirn@xxxxxxx> Signed-off-by: Qu Wenruo <wqu@xxxxxxxx> Reviewed-by: David Sterba <dsterba@xxxxxxxx> Signed-off-by: David Sterba <dsterba@xxxxxxxx> [sudip: manually backport, use btrfs_err with root->fs_info] Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- fs/btrfs/volumes.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -6414,6 +6414,13 @@ static int btrfs_check_chunk_valid(struc return -EIO; } + if (!is_power_of_2(type & BTRFS_BLOCK_GROUP_PROFILE_MASK) && + (type & BTRFS_BLOCK_GROUP_PROFILE_MASK) != 0) { + btrfs_err(root->fs_info, + "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) { btrfs_err(root->fs_info, "missing chunk type flag: 0x%llx", type); return -EIO; Patches currently in stable-queue which might be from wqu@xxxxxxxx are queue-4.9/btrfs-inode-verify-inode-mode-to-avoid-null-pointer-dereference.patch queue-4.9/btrfs-tree-checker-enhance-chunk-checker-to-validate-chunk-profile.patch