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 14713EEB571 for ; Fri, 8 Sep 2023 19:37:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243733AbjIHThf (ORCPT ); Fri, 8 Sep 2023 15:37:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345051AbjIHThU (ORCPT ); Fri, 8 Sep 2023 15:37:20 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F5551FE7; Fri, 8 Sep 2023 12:36:56 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 278E5C116A9; Fri, 8 Sep 2023 19:36:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694201806; bh=B5Qtjad5lEj5n5wKD2xgtCsUnMbsiRAop1lslHF1RRo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RDkzjwcltH/MijoRUGYMcC4h5fGIdXhpD//b+sC8IO6QyQZ2egWbpOkyswHrhKyNb 4weu9OJ2wmP8kNyBKhocHaTndHqyUKaW+vkM77FKoMqLHZzlzjpgSuppthjLKr/PIY +lAUulKySxUAvKWAsTx8K40P7zuusWrEp9oGgK1V7UBLVPFNzNDJGvAXOTasF+KV2Z fp39iAk8jQFKgeg9ChJLt/aNFcA5d3lo97KOQ5T6Lhtpn+VpeCOZvfxJQfSWiTEWRV mMIrSqQ6hx8NwWxQnYhfw+/FOYbnRqaj9kfhEZKoAq1KyQ9gNRAnmCWfdvFMU/Zgi4 P3odOtUCNcKUQ== 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.4 3/4] md: raid1: fix potential OOB in raid1_remove_disk() Date: Fri, 8 Sep 2023 15:36:39 -0400 Message-Id: <20230908193641.3463943-3-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230908193641.3463943-1-sashal@kernel.org> References: <20230908193641.3463943-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.256 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-raid@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 1919de4c8c12d..f96e079454700 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -1808,6 +1808,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