diff options
| author | Zhang Shurong <zhang_shurong@foxmail.com> | 2023-07-22 15:53:53 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-09-23 10:48:16 +0200 |
| commit | 91fbd4e75cb573f44d2619a9dc2f9ba927040760 (patch) | |
| tree | cf5ac6b7cde1b7fb4eaca626cc453b9da8b74630 /drivers/md | |
| parent | 9ac69bda79677028972098c56fa2e1a5031e1182 (diff) | |
| download | linux-stable-91fbd4e75cb573f44d2619a9dc2f9ba927040760.tar.gz linux-stable-91fbd4e75cb573f44d2619a9dc2f9ba927040760.tar.bz2 linux-stable-91fbd4e75cb573f44d2619a9dc2f9ba927040760.zip | |
md: raid1: fix potential OOB in raid1_remove_disk()
[ 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>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid1.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 0f8b1fb3d051..b459a3af9422 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -1783,6 +1783,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) |