]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
md: raid1: fix potential OOB in raid1_remove_disk()
authorZhang Shurong <zhang_shurong@foxmail.com>
Sat, 22 Jul 2023 07:53:53 +0000 (15:53 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Sep 2023 08:47:04 +0000 (10:47 +0200)
[ Upstream commit 8b0472b50bcf0f19a5119b00a53b63579c8e1e4d ]

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@foxmail.com>
Reviewed-by: Yu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/tencent_0D24426FAC6A21B69AC0C03CE4143A508F09@qq.com
Signed-off-by: Song Liu <song@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/md/raid1.c

index 28f78199de3ba462eabe034ee9f0faccbbe01b7f..3e54b6639e21308315cd8b355d006821027a93bc 100644 (file)
@@ -1775,6 +1775,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)