Skip to content

Commit

Permalink
md: raid1: fix potential OOB in raid1_remove_disk()
Browse files Browse the repository at this point in the history
[ Upstream commit 8b0472b ]

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 d17f744 ("md-raid10: fix KASAN warning")
2) commit 1ebc2ce ("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>
  • Loading branch information
ZhangShurong authored and gregkh committed Sep 23, 2023
1 parent 617c10c commit 4bdb92e
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/md/raid1.c
Expand Up @@ -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)
Expand Down

0 comments on commit 4bdb92e

Please sign in to comment.