Commit ce7fca5f authored by David Sterba's avatar David Sterba Committed by Chris Mason
Browse files

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: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 75d6ad38

fs/btrfs/disk-io.c

+19 −0
Original line number Original line Diff line number Diff line
@@ -3910,6 +3910,25 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info, 
		ret = -EINVAL;

		ret = -EINVAL;

	}

	}





	/*

	 * 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

	 * 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.

	 * but it's still possible that it's the one that's wrong.