From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23971CE79D0 for ; Wed, 20 Sep 2023 12:07:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235153AbjITMHx (ORCPT ); Wed, 20 Sep 2023 08:07:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235211AbjITMHw (ORCPT ); Wed, 20 Sep 2023 08:07:52 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FE1B92 for ; Wed, 20 Sep 2023 05:07:46 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BAA1AC433C8; Wed, 20 Sep 2023 12:07:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1695211666; bh=1/3bC75DnLT0Y3PZWPaB3nm0IeMAVRkJ2xIbMWYwfyc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p+9wqjbFyrRtY9X7eL2JI+2cJBDeqMxCjsKpxKR0J3hKeeblQHHyM3pUrQ15+suwj IK+H5bZifJJKieeF4tH2dwOAD/5HsnV8cJ50Dd4Hm2wkK4vb/IQr433afk6NcU6GKF F9Xr37AX/Kc3/wKVs3wDVKT+G0LI4qhRkyQMwg+0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhang Shurong , Yu Kuai , Song Liu , Sasha Levin Subject: [PATCH 4.14 160/186] md: raid1: fix potential OOB in raid1_remove_disk() Date: Wed, 20 Sep 2023 13:31:03 +0200 Message-ID: <20230920112842.705478612@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230920112836.799946261@linuxfoundation.org> References: <20230920112836.799946261@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhang Shurong [ 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 Reviewed-by: Yu Kuai Link: https://lore.kernel.org/r/tencent_0D24426FAC6A21B69AC0C03CE4143A508F09@qq.com Signed-off-by: Song Liu Signed-off-by: Sasha Levin --- drivers/md/raid1.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 28f78199de3ba..3e54b6639e213 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -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) -- 2.40.1