Unverified Commit 7d8bd75f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15303 md/raid1: fix memory leak in raid1_run() if no active rdev 

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

 

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 daf55dc8 14eaaf8f

drivers/md/raid1.c

+3 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ static int max_queued_requests = 1024; 


static void allow_barrier(struct r1conf *conf, sector_t sector_nr);

static void lower_barrier(struct r1conf *conf, sector_t sector_nr);

static void raid1_free(struct mddev *mddev, void *priv);



#define raid1_log(md, fmt, args...)				\

	do { if ((md)->queue) blk_add_trace_msg((md)->queue, "raid1 " fmt, ##args); } while (0)
@@ -3155,6 +3156,8 @@ static int raid1_run(struct mddev *mddev) 
	 */

	if (conf->raid_disks - mddev->degraded < 1) {

		md_unregister_thread(&conf->thread);

		if (!mddev->private)

			raid1_free(mddev, conf);

		return -EINVAL;

	}