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 AC2CEEEB56E for ; Fri, 8 Sep 2023 19:43:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237830AbjIHTnm (ORCPT ); Fri, 8 Sep 2023 15:43:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345092AbjIHThd (ORCPT ); Fri, 8 Sep 2023 15:37:33 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA3EE8E; Fri, 8 Sep 2023 12:37:11 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26D29C433BC; Fri, 8 Sep 2023 19:37:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694201820; bh=e3YeYBGvH10SBXss1V6CNifXK5eCIUILIYm48L+EQK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g1Ip72SPoNG78WvwApixeEEIlc0nOH/WW/xKECA+zQpSVxqhJ9zPcOCiKvE3ycXeh uRhvrJWNM8K7kEHyb9VIp9dj8yziaMMIVxf4Mdlbho6zeI+J3o2Nfm9TY/0Dv9Fo4k lOqxuM9+wmr/L840by/CU/U/loe7ysrv3XwHkeP1wpi4HRNyXapHGDxwL13qbeJ58c wrSuR0+xa7bnFAzNSSvrUhHYC1MMMiFMugnsm6XDqVPiWzC3cTqlcarSPTF+aL99Ck 9lDCk1/sQXSKp0GdISGHahkFJt7Rb3+U7zML4tNB9MuLotS9+KoBohu74aABHr2r02 AkeAB5UCOEohA== 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 4.14 2/3] md: raid1: fix potential OOB in raid1_remove_disk() Date: Fri, 8 Sep 2023 15:36:54 -0400 Message-Id: <20230908193656.3464052-2-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230908193656.3464052-1-sashal@kernel.org> References: <20230908193656.3464052-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.14.325 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 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