| From 1775e700d772ff8c19423048c55c3e3d876e2da3 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 15 Feb 2025 10:01:37 +0800 |
| Subject: md/raid1: fix memory leak in raid1_run() if no active rdev |
| |
| From: Zheng Qixing <zhengqixing@huawei.com> |
| |
| [ Upstream commit 5fbcf76e0dfe68578ffa2a8a691cc44cf586ae35 ] |
| |
| When `raid1_set_limits()` fails or when the array has no active |
| `rdev`, the allocated memory for `conf` is not properly freed. |
| |
| Add raid1_free() call to properly free the conf in error path. |
| |
| Fixes: 799af947ed13 ("md/raid1: don't free conf on raid0_run failure") |
| Signed-off-by: Zheng Qixing <zhengqixing@huawei.com> |
| Link: https://lore.kernel.org/linux-raid/20250215020137.3703757-1-zhengqixing@huaweicloud.com |
| Singed-off-by: Yu Kuai <yukuai3@huawei.com> |
| Stable-dep-of: 6abc7d5dcf0e ("md/raid1: fix memory leak in raid1_run()") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/md/raid1.c | 8 +++++++- |
| 1 file changed, 7 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c |
| index 4c6b1bd6da9bb..f9c18ade06f15 100644 |
| --- a/drivers/md/raid1.c |
| +++ b/drivers/md/raid1.c |
| @@ -45,6 +45,7 @@ |
| |
| 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 RAID_1_10_NAME "raid1" |
| #include "raid1-10.c" |
| @@ -3245,8 +3246,11 @@ static int raid1_run(struct mddev *mddev) |
| |
| if (!mddev_is_dm(mddev)) { |
| ret = raid1_set_limits(mddev); |
| - if (ret) |
| + if (ret) { |
| + if (!mddev->private) |
| + raid1_free(mddev, conf); |
| return ret; |
| + } |
| } |
| |
| mddev->degraded = 0; |
| @@ -3260,6 +3264,8 @@ static int raid1_run(struct mddev *mddev) |
| */ |
| if (conf->raid_disks - mddev->degraded < 1) { |
| md_unregister_thread(mddev, &conf->thread); |
| + if (!mddev->private) |
| + raid1_free(mddev, conf); |
| return -EINVAL; |
| } |
| |
| -- |
| 2.51.0 |
| |