diff options
| author |   David Sterba <dsterba@suse.cz> | 2014-10-31 18:42:05 +0100 |
|---|---|---|
| committer |   Chris Mason <clm@fb.com> | 2015-02-02 19:23:43 -0800 |
| commit | ce7fca5f57ed0fcd7e7b3d7b1a3e1791f8e56fa3 (patch) | |
| tree | 5b3886f01a02eccdf2927cd195a17f7995fbe6e2 /fs/btrfs | |
| parent | btrfs: more superblock checks, lower bounds on devices and sectorsize/nodesize (diff) | |
| download | linux-dev-ce7fca5f57ed0fcd7e7b3d7b1a3e1791f8e56fa3.tar.xz linux-dev-ce7fca5f57ed0fcd7e7b3d7b1a3e1791f8e56fa3.zip | |
btrfs: add checks for sys_chunk_array sizes
Verify that possible minimum and maximum size is set, validity of
contents is checked in btrfs_read_sys_array.
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/disk-io.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 11171362bd33..263d1471d01a 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3911,6 +3911,25 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info, } /* + * Obvious sys_chunk_array corruptions, it must hold at least one key + * and one chunk + */ + if (btrfs_super_sys_array_size(sb) > BTRFS_SYSTEM_CHUNK_ARRAY_SIZE) { + printk(KERN_ERR "BTRFS: system chunk array too big %u > %u\n", + btrfs_super_sys_array_size(sb), + BTRFS_SYSTEM_CHUNK_ARRAY_SIZE); + ret = -EINVAL; + } + if (btrfs_super_sys_array_size(sb) < sizeof(struct btrfs_disk_key) + + sizeof(struct btrfs_chunk)) { + printk(KERN_ERR "BTRFS: system chunk array too small %u < %lu\n", + btrfs_super_sys_array_size(sb), + sizeof(struct btrfs_disk_key) + + sizeof(struct btrfs_chunk)); + ret = -EINVAL; + } + + /* * The generation is a global counter, we'll trust it more than the others * but it's still possible that it's the one that's wrong. */ |