diff options
| author | Yu Kuai <yukuai3@huawei.com> | 2023-03-10 15:38:55 +0800 |
|---|---|---|
| committer | Song Liu <song@kernel.org> | 2023-04-14 00:42:03 -0700 |
| commit | f0ddb83da3cbbf8a1f9087a642c448ff52ee9abd (patch) | |
| tree | a01c3dcbb0062627c6d2281ec8911e804ca3864c /drivers/md | |
| parent | c9ac2acde53f5385de185bccf6aaa91cf9ac1541 (diff) | |
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: 43a521238aca ("md-cluster: choose correct label when clustered layout is not supported")
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20230310073855.1337560-7-yukuai1@huaweicloud.com
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid10.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index befa4775c78b..375ed73f6c9e 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -4150,6 +4150,9 @@ static int raid10_run(struct mddev *mddev) if (!conf) goto out; + mddev->thread = conf->thread; + conf->thread = NULL; + if (mddev_is_clustered(conf->mddev)) { int fc, fo; @@ -4162,9 +4165,6 @@ static int raid10_run(struct mddev *mddev) } } - mddev->thread = conf->thread; - conf->thread = NULL; - if (mddev->queue) { blk_queue_max_write_zeroes_sectors(mddev->queue, 0); blk_queue_io_min(mddev->queue, mddev->chunk_sectors << 9); |