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 ADCD7C433EF for ; Mon, 18 Jul 2022 05:19:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231509AbiGRFTJ (ORCPT ); Mon, 18 Jul 2022 01:19:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233287AbiGRFTD (ORCPT ); Mon, 18 Jul 2022 01:19:03 -0400 Received: from out0.migadu.com (out0.migadu.com [IPv6:2001:41d0:2:267::]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B8F46323 for ; Sun, 17 Jul 2022 22:19:00 -0700 (PDT) Message-ID: <8c062246-5cdf-9821-c047-e18f54f392e3@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1658121538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h8rsZLg6sN9RC+YY8cVHWFT1O19lEFArrCtRMzc6fAY=; b=NQSck8+6b6jHoib2e/YmlauPLx9kSnT+AyE9/vPCHTERrOsxalIqXWDbfF1iZJYN3IGacY wU9UYZ5/biTa1SkZ1rCrmgPVYE4paMVH+0LfMBLHGowPkCbJZjBxBjVOi0EV9zp0ylp5jV abPdHpLpYj03ISV8/BdZEGvjCZvepT4= Date: Mon, 18 Jul 2022 13:18:49 +0800 MIME-Version: 1.0 Subject: Re: [PATCH RESEND] raid5: fix duplicate checks for rdev->saved_raid_disk Content-Language: en-US To: Song Liu Cc: linux-raid References: <20220716031136.1426264-1-liu.yun@linux.dev> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Jackie Liu In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev Precedence: bulk List-ID: X-Mailing-List: linux-raid@vger.kernel.org Hi, Song. 在 2022/7/17 13:31, Song Liu 写道: > On Fri, Jul 15, 2022 at 8:11 PM Jackie Liu wrote: >> >> From: Jackie Liu >> >> 'first' will always be greater than or equal to 0, it is unnecessary to >> repeat the 0 check, clean it up. >> >> Signed-off-by: Jackie Liu > > This looks identical to the original version. Which branch is this based on? > Please rebase on top of md-next branch and resend the patch: > > https://git.kernel.org/pub/scm/linux/kernel/git/song/md.git/log/?h=md-next > The md-next branch is lower than the upstream version, v5.19-rc5 adds a patch. commit 617b365872a247480e9dcd50a32c8d1806b21861 Author: Mikulas Patocka Date: Wed Jun 29 13:40:57 2022 -0400 dm raid: fix KASAN warning in raid5_add_disks There's a KASAN warning in raid5_add_disk when running the LVM testsuite. The warning happens in the test lvconvert-raid-reshape-linear_to_raid6-single-type.sh. We fix the warning by verifying that rdev->saved_raid_disk is within limits. Cc: stable@vger.kernel.org Signed-off-by: Mikulas Patocka Signed-off-by: Mike Snitzer diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index ba289411f26f..20e53b167f81 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -8065,6 +8065,7 @@ static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev) */ if (rdev->saved_raid_disk >= 0 && rdev->saved_raid_disk >= first && + rdev->saved_raid_disk <= last && conf->disks[rdev->saved_raid_disk].rdev == NULL) first = rdev->saved_raid_disk; ... can you rebase from upstream? Thanks. -- Jackie > Thanks, > Song > >> --- >> drivers/md/raid5.c | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c >> index 20e53b167f81..a0b38a0ea9c3 100644 >> --- a/drivers/md/raid5.c >> +++ b/drivers/md/raid5.c >> @@ -8063,8 +8063,7 @@ static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev) >> * find the disk ... but prefer rdev->saved_raid_disk >> * if possible. >> */ >> - if (rdev->saved_raid_disk >= 0 && >> - rdev->saved_raid_disk >= first && >> + if (rdev->saved_raid_disk >= first && >> rdev->saved_raid_disk <= last && >> conf->disks[rdev->saved_raid_disk].rdev == NULL) >> first = rdev->saved_raid_disk; >> -- >> 2.25.1 >>