btrfs: Promote debugging asserts to full-flegded checks in validate_super
PATCH 1/1 btrfs: Promote debugging asserts to full-flegded checks in validate_super
Syzbot managed to trigger this assert while performing its fuzzing. Turns out it's better to have those asserts turned into full-fledged checks so that in case buggy btrfs images are mounted the users gets an error and mounting is stopped. Alternatively with CONFIG_BTRFS_ASSERT disabled such image would have been erroneously allowed to be mounted.
--- fs/btrfs/disk-io.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
fs/btrfs/disk-io.c +13 -8
@@ -2648,6 +2648,19 @@ static int validate_super(struct btrfs_fs_info *fs_info, ret = -EINVAL ; } +if (memcmp (fs_info->fs_devices->fsid, fs_info->super_copy->fsid, +BTRFS_FSID_SIZE )) { +btrfs_err (fs_info,"superblock fsid doesn't match fsid of fs_devices" ); + ret = -EINVAL ; + } + +if (btrfs_fs_incompat (fs_info,METADATA_UUID ) && +memcmp (fs_info->fs_devices->metadata_uuid, + fs_info->super_copy->metadata_uuid,BTRFS_FSID_SIZE )) { +btrfs_err (fs_info,"superblock's metadata uuid doesn't match metadata uuid of fsdevices" ); + ret = -EINVAL ; + } +if (memcmp (fs_info->fs_devices->metadata_uuid, sb->dev_item.fsid,BTRFS_FSID_SIZE ) !=0 ) { btrfs_err(fs_info,
@@ -3279,14 +3292,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device disk_super = fs_info->super_copy; -ASSERT (!memcmp (fs_info->fs_devices->fsid, fs_info->super_copy->fsid, -BTRFS_FSID_SIZE )); - -if (btrfs_fs_incompat (fs_info,METADATA_UUID )) { -ASSERT (!memcmp (fs_info->fs_devices->metadata_uuid, - fs_info->super_copy->metadata_uuid, -BTRFS_FSID_SIZE )); - } features =btrfs_super_flags (disk_super);if (features &BTRFS_SUPER_FLAG_CHANGING_FSID_V2 ) {
Signature · 1 line
2.25.1
Quoted 5 lines · Nikolay Borisov
Syzbot managed to trigger this assert while performing its fuzzing. Turns out it's better to have those asserts turned into full-fledged checks so that in case buggy btrfs images are mounted the users gets an error and mounting is stopped. Alternatively with
CONFIG_BTRFS_ASSERTdisabled such image would have been erroneously allowed to be mounted.
Agreed,
Quoted 8 lines · Nikolay Borisov
Syzbot managed to trigger this assert while performing its fuzzing. Turns out it's better to have those asserts turned into full-fledged checks so that in case buggy btrfs images are mounted the users gets an error and mounting is stopped. Alternatively with
CONFIG_BTRFS_ASSERTdisabled such image would have been erroneously allowed to be mounted.Reported-by [email protected]Signed-off-by Nikolay Borisov <[email protected]>
Thanks,
Qu
Quoted 44 lines
--- fs/btrfs/disk-io.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)fs/btrfs/disk-io.c +13
-8@@ -2648,6 +2648,19 @@ static int validate_super(struct btrfs_fs_info *fs_info, ret = -EINVAL ; } +if (memcmp (fs_info->fs_devices->fsid, fs_info->super_copy->fsid, +BTRFS_FSID_SIZE )) { +btrfs_err (fs_info,"superblock fsid doesn't match fsid of fs_devices" ); + ret = -EINVAL ; + } + +if (btrfs_fs_incompat (fs_info,METADATA_UUID ) && +memcmp (fs_info->fs_devices->metadata_uuid, + fs_info->super_copy->metadata_uuid,BTRFS_FSID_SIZE )) { +btrfs_err (fs_info,"superblock's metadata uuid doesn't match metadata uuid of fsdevices" ); + ret = -EINVAL ; + } +if (memcmp (fs_info->fs_devices->metadata_uuid, sb->dev_item.fsid,BTRFS_FSID_SIZE ) !=0 ) { btrfs_err(fs_info,@@ -3279,14 +3292,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device disk_super = fs_info->super_copy; -ASSERT (!memcmp (fs_info->fs_devices->fsid, fs_info->super_copy->fsid, -BTRFS_FSID_SIZE )); - -if (btrfs_fs_incompat (fs_info,METADATA_UUID )) { -ASSERT (!memcmp (fs_info->fs_devices->metadata_uuid, - fs_info->super_copy->metadata_uuid, -BTRFS_FSID_SIZE )); - } features =btrfs_super_flags (disk_super);if (features &BTRFS_SUPER_FLAG_CHANGING_FSID_V2 ) {
Quoted 8 lines · Nikolay Borisov
Syzbot managed to trigger this assert while performing its fuzzing. Turns out it's better to have those asserts turned into full-fledged checks so that in case buggy btrfs images are mounted the users gets an error and mounting is stopped. Alternatively with
CONFIG_BTRFS_ASSERTdisabled such image would have been erroneously allowed to be mounted.Reported-by [email protected]Signed-off-by Nikolay Borisov <[email protected]>
Added to misc-next, thanks.