Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <tencent_E2C71605D88087940237AA9A44CC8D436D06@qq.com>
From:   Zhang Shurong <zhang_shurong@foxmail.com>
To:     song@kernel.org
Cc:     linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org,
        Zhang Shurong <zhang_shurong@foxmail.com>
Subject: [PATCH] md: fix potential OOB in multipath_remove_disk()
Date:   Thu, 13 Jul 2023 00:46:05 +0800
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

If rddev->raid_disk is greater than mddev->raid_disks, there will be
an out-of-bounds in multipath_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>
---
 drivers/md/md-multipath.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/md/md-multipath.c b/drivers/md/md-multipath.c
index 92c45be203d7..7b6aadd8c1fb 100644
--- a/drivers/md/md-multipath.c
+++ b/drivers/md/md-multipath.c
@@ -245,7 +245,11 @@ static int multipath_remove_disk(struct mddev *mddev, struct md_rdev *rdev)
 	struct mpconf *conf = mddev->private;
 	int err = 0;
 	int number = rdev->raid_disk;
-	struct multipath_info *p = conf->multipaths + number;
+	struct multipath_info *p;
+
+	if (unlikely(number >= mddev->raid_disks))
+		return 0;
+	p = conf->multipaths + number;
 
 	print_multipath_conf(conf);
 
-- 
2.30.2