mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 18:30:06 +00:00
btrfs: use macro accessors in superblock validation checks
The initial patch c926093ec5
(btrfs: add more superblock checks)
did not properly use the macro accessors that wrap endianness and the
code would not work correctly on big endian machines.
Reported-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
parent
d37973082b
commit
21e7626b12
1 changed files with 22 additions and 21 deletions
|
@ -3817,19 +3817,19 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info,
|
|||
struct btrfs_super_block *sb = fs_info->super_copy;
|
||||
int ret = 0;
|
||||
|
||||
if (sb->root_level > BTRFS_MAX_LEVEL) {
|
||||
printk(KERN_ERR "BTRFS: tree_root level too big: %d > %d\n",
|
||||
sb->root_level, BTRFS_MAX_LEVEL);
|
||||
if (btrfs_super_root_level(sb) >= BTRFS_MAX_LEVEL) {
|
||||
printk(KERN_ERR "BTRFS: tree_root level too big: %d >= %d\n",
|
||||
btrfs_super_root_level(sb), BTRFS_MAX_LEVEL);
|
||||
ret = -EINVAL;
|
||||
}
|
||||
if (sb->chunk_root_level > BTRFS_MAX_LEVEL) {
|
||||
printk(KERN_ERR "BTRFS: chunk_root level too big: %d > %d\n",
|
||||
sb->chunk_root_level, BTRFS_MAX_LEVEL);
|
||||
if (btrfs_super_chunk_root_level(sb) >= BTRFS_MAX_LEVEL) {
|
||||
printk(KERN_ERR "BTRFS: chunk_root level too big: %d >= %d\n",
|
||||
btrfs_super_chunk_root_level(sb), BTRFS_MAX_LEVEL);
|
||||
ret = -EINVAL;
|
||||
}
|
||||
if (sb->log_root_level > BTRFS_MAX_LEVEL) {
|
||||
printk(KERN_ERR "BTRFS: log_root level too big: %d > %d\n",
|
||||
sb->log_root_level, BTRFS_MAX_LEVEL);
|
||||
if (btrfs_super_log_root_level(sb) >= BTRFS_MAX_LEVEL) {
|
||||
printk(KERN_ERR "BTRFS: log_root level too big: %d >= %d\n",
|
||||
btrfs_super_log_root_level(sb), BTRFS_MAX_LEVEL);
|
||||
ret = -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -3837,15 +3837,15 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info,
|
|||
* The common minimum, we don't know if we can trust the nodesize/sectorsize
|
||||
* items yet, they'll be verified later. Issue just a warning.
|
||||
*/
|
||||
if (!IS_ALIGNED(sb->root, 4096))
|
||||
if (!IS_ALIGNED(btrfs_super_root(sb), 4096))
|
||||
printk(KERN_WARNING "BTRFS: tree_root block unaligned: %llu\n",
|
||||
sb->root);
|
||||
if (!IS_ALIGNED(sb->chunk_root, 4096))
|
||||
if (!IS_ALIGNED(btrfs_super_chunk_root(sb), 4096))
|
||||
printk(KERN_WARNING "BTRFS: tree_root block unaligned: %llu\n",
|
||||
sb->chunk_root);
|
||||
if (!IS_ALIGNED(sb->log_root, 4096))
|
||||
if (!IS_ALIGNED(btrfs_super_log_root(sb), 4096))
|
||||
printk(KERN_WARNING "BTRFS: tree_root block unaligned: %llu\n",
|
||||
sb->log_root);
|
||||
btrfs_super_log_root(sb));
|
||||
|
||||
if (memcmp(fs_info->fsid, sb->dev_item.fsid, BTRFS_UUID_SIZE) != 0) {
|
||||
printk(KERN_ERR "BTRFS: dev_item UUID does not match fsid: %pU != %pU\n",
|
||||
|
@ -3857,13 +3857,13 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info,
|
|||
* Hint to catch really bogus numbers, bitflips or so, more exact checks are
|
||||
* done later
|
||||
*/
|
||||
if (sb->num_devices > (1UL << 31))
|
||||
if (btrfs_super_num_devices(sb) > (1UL << 31))
|
||||
printk(KERN_WARNING "BTRFS: suspicious number of devices: %llu\n",
|
||||
sb->num_devices);
|
||||
btrfs_super_num_devices(sb));
|
||||
|
||||
if (sb->bytenr != BTRFS_SUPER_INFO_OFFSET) {
|
||||
if (btrfs_super_bytenr(sb) != BTRFS_SUPER_INFO_OFFSET) {
|
||||
printk(KERN_ERR "BTRFS: super offset mismatch %llu != %u\n",
|
||||
sb->bytenr, BTRFS_SUPER_INFO_OFFSET);
|
||||
btrfs_super_bytenr(sb), BTRFS_SUPER_INFO_OFFSET);
|
||||
ret = -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -3871,14 +3871,15 @@ static int btrfs_check_super_valid(struct btrfs_fs_info *fs_info,
|
|||
* 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.
|
||||
*/
|
||||
if (sb->generation < sb->chunk_root_generation)
|
||||
if (btrfs_super_generation(sb) < btrfs_super_chunk_root_generation(sb))
|
||||
printk(KERN_WARNING
|
||||
"BTRFS: suspicious: generation < chunk_root_generation: %llu < %llu\n",
|
||||
sb->generation, sb->chunk_root_generation);
|
||||
if (sb->generation < sb->cache_generation && sb->cache_generation != (u64)-1)
|
||||
btrfs_super_generation(sb), btrfs_super_chunk_root_generation(sb));
|
||||
if (btrfs_super_generation(sb) < btrfs_super_cache_generation(sb)
|
||||
&& btrfs_super_cache_generation(sb) != (u64)-1)
|
||||
printk(KERN_WARNING
|
||||
"BTRFS: suspicious: generation < cache_generation: %llu < %llu\n",
|
||||
sb->generation, sb->cache_generation);
|
||||
btrfs_super_generation(sb), btrfs_super_cache_generation(sb));
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue