[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <tencent_0D24426FAC6A21B69AC0C03CE4143A508F09@qq.com>
Date: Sat, 22 Jul 2023 15:53:53 +0800
From: Zhang Shurong <zhang_shurong@...mail.com>
To: song@...nel.org, yukuai1@...weicloud.com
Cc: linux-raid@...r.kernel.org, linux-kernel@...r.kernel.org,
yukuai3@...wei.com, Zhang Shurong <zhang_shurong@...mail.com>
Subject: [PATCH v2] md: raid1: fix potential OOB in raid1_remove_disk()
If rddev->raid_disk is greater than mddev->raid_disks, there will be
an out-of-bounds in raid1_remove_disk(). We have already found
similar reports as follows:
1) commit d17f744e883b ("md-raid10: fix KASAN warning")
2) commit 1ebc2cec0b7d ("dm raid: fix KASAN warning in raid5_remove_disk")
Fix this bug by checking whether the "number" variable is
valid.
Signed-off-by: Zhang Shurong <zhang_shurong@...mail.com>
---
Changes in v2:
- Using conf->raid_disks instead of mddev->raid_disks.
drivers/md/raid1.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index dd25832eb045..80aeee63dfb7 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1829,6 +1829,10 @@ static int raid1_remove_disk(struct mddev *mddev, struct md_rdev *rdev)
struct r1conf *conf = mddev->private;
int err = 0;
int number = rdev->raid_disk;
+
+ if (unlikely(number >= conf->raid_disks))
+ goto abort;
+
struct raid1_info *p = conf->mirrors + number;
if (rdev != p->rdev)
--
2.41.0
Powered by blists - more mailing lists