Skip to content

Commit 83c68bb

Browse files
Damenlykdave
authored andcommitted
btrfs: initialize fs_info::csum_size earlier in open_ctree
User reported that btrfs-progs misc-tests/028-superblock-recover fails: [TEST/misc] 028-superblock-recover unexpected success: mounted fs with corrupted superblock test failed for case 028-superblock-recover The test case expects that a broken image with bad superblock will be rejected to be mounted. However, the test image just passed csum check of superblock and was successfully mounted. Commit 55fc29b ("btrfs: use cached value of fs_info::csum_size everywhere") replaces all calls to btrfs_super_csum_size by fs_info::csum_size. The calls include the place where fs_info->csum_size is not initialized. So btrfs_check_super_csum() passes because memcmp() with len 0 always returns 0. Fix it by caching csum size in btrfs_fs_info::csum_size once we know the csum type in superblock is valid in open_ctree(). Link: kdave/btrfs-progs#250 Fixes: 55fc29b ("btrfs: use cached value of fs_info::csum_size everywhere") Signed-off-by: Su Yue <[email protected]> Reviewed-by: David Sterba <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 9ad6d91 commit 83c68bb

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

fs/btrfs/disk-io.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3044,6 +3044,8 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device
30443044
goto fail_alloc;
30453045
}
30463046

3047+
fs_info->csum_size = btrfs_super_csum_size(disk_super);
3048+
30473049
ret = btrfs_init_csum_hash(fs_info, csum_type);
30483050
if (ret) {
30493051
err = ret;
@@ -3161,7 +3163,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device
31613163
fs_info->nodesize = nodesize;
31623164
fs_info->sectorsize = sectorsize;
31633165
fs_info->sectorsize_bits = ilog2(sectorsize);
3164-
fs_info->csum_size = btrfs_super_csum_size(disk_super);
31653166
fs_info->csums_per_leaf = BTRFS_MAX_ITEM_SIZE(fs_info) / fs_info->csum_size;
31663167
fs_info->stripesize = stripesize;
31673168

0 commit comments

Comments
 (0)