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

btrfs: compare the correct fsid/metadata_uuid in btrfs_validate_super 

stable inclusion
from stable-v5.10.197
commit df380d6f5c06c7b8e5fd06819aa0b7fe1175d32b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I96Q8P

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



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

[ Upstream commit 6bfe3959 ]

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

Such as in the following stacks:

  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::metadata_uuid
instead.  Fix this using the correct metadata_uuid 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 avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 95109cae

fs/btrfs/disk-io.c

+3 −5
Original line number Diff line number Diff line
@@ -2512,13 +2512,11 @@ static int validate_super(struct btrfs_fs_info *fs_info, 
		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)) {

	if (memcmp(fs_info->fs_devices->metadata_uuid, btrfs_sb_fsid_ptr(sb),

		   BTRFS_FSID_SIZE) != 0) {

		btrfs_err(fs_info,

"superblock metadata_uuid doesn't match metadata uuid of fs_devices: %pU != %pU",

			fs_info->super_copy->metadata_uuid,

			fs_info->fs_devices->metadata_uuid);

			  btrfs_sb_fsid_ptr(sb), fs_info->fs_devices->metadata_uuid);

		ret = -EINVAL;

	}