Unverified Commit 1310759d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15361 md/bitmap: don't set sb values if can't pass sanity check 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zheng Qixing <zhengqixing@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/6SECM5KNIY7Q5SC3JIL4NZ7F6FXBOCGX/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBP417 
 
Link:https://gitee.com/openeuler/kernel/pulls/15361

 

Reviewed-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents fcb4c240 611fad2a

drivers/md/md-bitmap.c

+23 −21
Original line number Diff line number Diff line
@@ -641,14 +641,6 @@ static int md_bitmap_read_sb(struct bitmap *bitmap) 
	daemon_sleep = le32_to_cpu(sb->daemon_sleep) * HZ;

	write_behind = le32_to_cpu(sb->write_behind);

	sectors_reserved = le32_to_cpu(sb->sectors_reserved);

	/* Setup nodes/clustername only if bitmap version is

	 * cluster-compatible

	 */

	if (sb->version == cpu_to_le32(BITMAP_MAJOR_CLUSTERED)) {

		nodes = le32_to_cpu(sb->nodes);

		strlcpy(bitmap->mddev->bitmap_info.cluster_name,

				sb->cluster_name, 64);

	}



	/* verify that the bitmap-specific fields are valid */

	if (sb->magic != cpu_to_le32(BITMAP_MAGIC))
@@ -670,6 +662,16 @@ static int md_bitmap_read_sb(struct bitmap *bitmap) 
		goto out;

	}



	/*

	 * Setup nodes/clustername only if bitmap version is

	 * cluster-compatible

	 */

	if (sb->version == cpu_to_le32(BITMAP_MAJOR_CLUSTERED)) {

		nodes = le32_to_cpu(sb->nodes);

		strlcpy(bitmap->mddev->bitmap_info.cluster_name,

				sb->cluster_name, 64);

	}



	/* keep the array size field of the bitmap superblock up to date */

	sb->sync_size = cpu_to_le64(bitmap->mddev->resync_max_sectors);
@@ -702,9 +704,9 @@ static int md_bitmap_read_sb(struct bitmap *bitmap) 


out:

	kunmap_atomic(sb);

	if (err == 0 && nodes && (bitmap->cluster_slot < 0)) {

		/* Assigning chunksize is required for "re_read" */

		bitmap->mddev->bitmap_info.chunksize = chunksize;

	if (err == 0 && nodes && (bitmap->cluster_slot < 0)) {

		err = md_setup_cluster(bitmap->mddev, nodes);

		if (err) {

			pr_warn("%s: Could not setup cluster service (%d)\n",
@@ -715,8 +717,8 @@ static int md_bitmap_read_sb(struct bitmap *bitmap) 
		goto re_read;

	}





out_no_sb:

	if (err == 0) {

		if (test_bit(BITMAP_STALE, &bitmap->flags))

			bitmap->events_cleared = bitmap->mddev->events;

		bitmap->mddev->bitmap_info.chunksize = chunksize;
@@ -726,7 +728,7 @@ static int md_bitmap_read_sb(struct bitmap *bitmap) 
		if (bitmap->mddev->bitmap_info.space == 0 ||

			bitmap->mddev->bitmap_info.space > sectors_reserved)

			bitmap->mddev->bitmap_info.space = sectors_reserved;

	if (err) {

	} else {

		md_bitmap_print_sb(bitmap);

		if (bitmap->cluster_slot < 0)

			md_cluster_stop(bitmap->mddev);