Commit 6470bb81 authored by Anand Jain's avatar Anand Jain Committed by sanglipeng
Browse files

btrfs: use the correct superblock to compare fsid in btrfs_validate_super 

stable inclusion
from stable-v5.10.195
commit e76cef3dcdb88f94274881a35103a8cee4dc4ed3
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I95JOC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e76cef3dcdb88f94274881a35103a8cee4dc4ed3



--------------------------------

commit d167aa76 upstream.

The function btrfs_validate_super() should verify the fsid in the provided
superblock argument. Because, all its callers expect it to do that.

Such as in the following stack:

   write_all_supers()
       sb = fs_info->super_for_commit;
       btrfs_validate_write_super(.., sb)
         btrfs_validate_super(.., sb, ..)

   scrub_one_super()
	btrfs_validate_super(.., sb, ..)

And
   check_dev_super()
	btrfs_validate_super(.., sb, ..)

However, it currently verifies the fs_info::super_copy::fsid instead,
which is not correct.  Fix this using the correct fsid in the superblock
argument.

CC: stable@vger.kernel.org # 5.4+
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Tested-by: default avatarGuilherme G. Piccoli <gpiccoli@igalia.com>
Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 5a51d427

fs/btrfs/disk-io.c

+2 −3
Original line number Diff line number Diff line
@@ -2496,11 +2496,10 @@ 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)) {

	if (memcmp(fs_info->fs_devices->fsid, sb->fsid, BTRFS_FSID_SIZE) != 0) {

		btrfs_err(fs_info,

		"superblock fsid doesn't match fsid of fs_devices: %pU != %pU",

			fs_info->super_copy->fsid, fs_info->fs_devices->fsid);

			  sb->fsid, fs_info->fs_devices->fsid);

		ret = -EINVAL;

	}