Commit f0ddb83d authored by Yu Kuai's avatar Yu Kuai Committed by Song Liu

md/raid10: fix memleak of md thread

In raid10_run(), if setup_conf() succeed and raid10_run() failed before
setting 'mddev->thread', then in the error path 'conf->thread' is not
freed.

Fix the problem by setting 'mddev->thread' right after setup_conf().

Fixes: 43a52123 ("md-cluster: choose correct label when clustered layout is not supported")
Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20230310073855.1337560-7-yukuai1@huaweicloud.com
parent c9ac2acd
...@@ -4150,6 +4150,9 @@ static int raid10_run(struct mddev *mddev) ...@@ -4150,6 +4150,9 @@ static int raid10_run(struct mddev *mddev)
if (!conf) if (!conf)
goto out; goto out;
mddev->thread = conf->thread;
conf->thread = NULL;
if (mddev_is_clustered(conf->mddev)) { if (mddev_is_clustered(conf->mddev)) {
int fc, fo; int fc, fo;
...@@ -4162,9 +4165,6 @@ static int raid10_run(struct mddev *mddev) ...@@ -4162,9 +4165,6 @@ static int raid10_run(struct mddev *mddev)
} }
} }
mddev->thread = conf->thread;
conf->thread = NULL;
if (mddev->queue) { if (mddev->queue) {
blk_queue_max_write_zeroes_sectors(mddev->queue, 0); blk_queue_max_write_zeroes_sectors(mddev->queue, 0);
blk_queue_io_min(mddev->queue, mddev->chunk_sectors << 9); blk_queue_io_min(mddev->queue, mddev->chunk_sectors << 9);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment