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 52B74EEB56B for ; Fri, 8 Sep 2023 19:38:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232855AbjIHTi3 (ORCPT ); Fri, 8 Sep 2023 15:38:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345407AbjIHTiH (ORCPT ); Fri, 8 Sep 2023 15:38:07 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19BBA2127; Fri, 8 Sep 2023 12:37:44 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4411C113C9; Fri, 8 Sep 2023 19:36:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694201798; bh=qolxTgZUgbllgyJ01CCZ5WCfRWTxBtzSJ4F5lmg0HCY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eFUk9/v+5Odr1ITT/dhTwdQRN4xoqoDL04nDJth1p8zjKf608jRT7S4aSvTPhbNIE rMBJIinBGDcTkjpTXEDculxcYeuJ1U1hmlzqCh4ekpA4Xgh1kxioAhVYbBbkH6c4d0 cwMtZRhFXinduuoPS21cyMHm+tz7pnW5d9kaPu16/pur5pljuqmXUK6lh5TOFEK1in M7nmR7H79+1FNvQ7aM5T1kOBwFbShg9DD2h6ht8ymmwYOLrGhlJL+ZO39FwKIKRiEc 56r5VSWG2TIW27zOBC4j7J65xLw19ENeJGGVVvFI/3ooPuguPvdMdexIO1i4NwLHoh z3qgK6rxb6rNQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhang Shurong , Yu Kuai , Song Liu , Sasha Levin , linux-raid@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 8/9] md: raid1: fix potential OOB in raid1_remove_disk() Date: Fri, 8 Sep 2023 15:36:09 -0400 Message-Id: <20230908193611.3463821-8-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230908193611.3463821-1-sashal@kernel.org> References: <20230908193611.3463821-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.194 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 6b5cc3f59fb39..25be491c1a6ac 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -1791,6 +1791,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