diff options
| author | Qu Wenruo | 2018-07-03 11:10:05 +0200 |
|---|---|---|
| committer | David Sterba | 2018-08-06 13:12:41 +0200 |
| commit | fce466eab7ac6baa9d2dcd88abcf945be3d4a089 (patch) | |
| tree | b1dfc302a5c93cf38ab82bf11cdabc2b47dc9f91 /fs/btrfs/volumes.c | |
| parent | btrfs: annotate unlikely branches after V0 extent type removal (diff) | |
| download | kernel-qcow2-linux-fce466eab7ac6baa9d2dcd88abcf945be3d4a089.tar.gz kernel-qcow2-linux-fce466eab7ac6baa9d2dcd88abcf945be3d4a089.tar.xz kernel-qcow2-linux-fce466eab7ac6baa9d2dcd88abcf945be3d4a089.zip | |
btrfs: tree-checker: Verify block_group_item
A crafted image with invalid block group items could make free space cache
code to cause panic.
We could detect such invalid block group item by checking:
1) Item size
Known fixed value.
2) Block group size (key.offset)
We have an upper limit on block group item (10G)
3) Chunk objectid
Known fixed value.
4) Type
Only 4 valid type values, DATA, METADATA, SYSTEM and DATA|METADATA.
No more than 1 bit set for profile type.
5) Used space
No more than the block group size.
This should allow btrfs to detect and refuse to mount the crafted image.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=199849
Reported-by: Xu Wen <wen.xu@gatech.edu>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Gu Jinxiang <gujx@cn.fujitsu.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Tested-by: Gu Jinxiang <gujx@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index fe497937933f..256e57eec8ec 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -4692,7 +4692,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, if (type & BTRFS_BLOCK_GROUP_DATA) { max_stripe_size = SZ_1G; - max_chunk_size = 10 * max_stripe_size; + max_chunk_size = BTRFS_MAX_DATA_CHUNK_SIZE; if (!devs_max) devs_max = BTRFS_MAX_DEVS(info); } else if (type & BTRFS_BLOCK_GROUP_METADATA) { |