From patchwork Mon May 22 11:54:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Nan X-Patchwork-Id: 97346 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1389499vqo; Mon, 22 May 2023 04:58:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ49UEVzhmBmO64XY31d/r5/7f1m371r4EqefwHmhUHoqwZyQoXI4Hf4t4Lx5QPXfmGqznvV X-Received: by 2002:a05:6a20:c701:b0:107:1805:fef5 with SMTP id hi1-20020a056a20c70100b001071805fef5mr9374285pzb.28.1684756735424; Mon, 22 May 2023 04:58:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684756735; cv=none; d=google.com; s=arc-20160816; b=nDVfK53NJbmwZDOycNpx7soQg6pEx3xtL6bzilp+9ZYi/sThsuq1Lj6qopXdWpDbuA 8wmfoFhS1wsx25yWGC8/XDLJmOfGFRgBTpa+uXuhODAkgR5rmTPfV2bJYQEUcq+KoDL+ dblJ3Z6/ULJb1Zsc+V1WEwjE3ujnTUimxuA1cOZRvCSjW16jTLfjz0/YMtEWe65sis7q 0rU20VelCtb1mYlmaRSI9JLAuSD0pU8YRPyIqqBaZGFrCc/KVGno1n09Q/vohHtk3O46 v7GHF/jdfvhd2V6fjpuIfXmfy94FcIhrzZrZOOUxPXZV6ejLmWaOZwNSIBfu9AVhrBuf O0eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=aJ4ITCYClNiTO8Ep9Y1fg85PT736vuhQIVwUmvYuJIM=; b=JQlzYTjjcuOcDl5anJYRUZJaNj2jcD9at42qSoMweeX3jX+1O6T/iKxotfYtkG8mWF Yn55wjaFrdGG4oqzD9WziUAEGUoGBjDKk16YKLZIHDULfyQYHl8S5CR/g5gkz7I7Il35 NXCpTo5UrscN4QIK/v47xywFRo0YPQvZMF8nMr34bI1lH34yyJugy3pOjozXwpvTT5Pn iRXrwzHZtHykLXDBiGeibc2xS24GiGvUc1OS/Ra7zmd+zBqI2WGy4wvrbp5NVeVpD31U GgXQoPG5Oxf8TKjZ1j+yOgV5IbyqULISBI/oCjdrTqheYTcIT75XGE1gihjFdUd73/p+ GtJw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u189-20020a6385c6000000b00534913a5303si4694812pgd.540.2023.05.22.04.58.40; Mon, 22 May 2023 04:58:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233553AbjEVL4j (ORCPT + 99 others); Mon, 22 May 2023 07:56:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233510AbjEVL41 (ORCPT ); Mon, 22 May 2023 07:56:27 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87458A1; Mon, 22 May 2023 04:56:24 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4QPwrz3gvRz4f42lP; Mon, 22 May 2023 19:56:19 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgBXwLNiWGtk2XrkJw--.28031S5; Mon, 22 May 2023 19:56:21 +0800 (CST) From: linan666@huaweicloud.com To: song@kernel.org, shli@fb.com, allenpeng@synology.com, alexwu@synology.com, bingjingc@synology.com, neilb@suse.de Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, linan122@huawei.com, yukuai3@huawei.com, yi.zhang@huawei.com, houtao1@huawei.com, yangerkun@huawei.com Subject: [PATCH 1/3] md/raid10: fix null-ptr-deref of mreplace in raid10_sync_request Date: Mon, 22 May 2023 19:54:47 +0800 Message-Id: <20230522115449.2203939-2-linan666@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230522115449.2203939-1-linan666@huaweicloud.com> References: <20230522115449.2203939-1-linan666@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBXwLNiWGtk2XrkJw--.28031S5 X-Coremail-Antispam: 1UD129KBjvJXoW7Kw47KrWDCF4UGry7Wr43GFg_yoW8trWfp3 y7tF9rGw4UG3yjka1DA3ZrWF1SvasrJrW5Cry5W343Zr1agrZrCay8WFWYvFyDXF4Yg3yY qw1jyws8uFWxXa7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUm0b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUGw A2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2vYz4IE04k24VAvwVAKI4IrM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrV ACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWU JVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2 ka0xkIwI1lw4CEc2x0rVAKj4xxMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j 6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7 AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE 2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcV C2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVj vjDU0xZFpf9x07jYFALUUUUU= X-CM-SenderInfo: polqt0awwwqx5xdzvxpfor3voofrz/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766595478182244824?= X-GMAIL-MSGID: =?utf-8?q?1766595478182244824?= From: Li Nan need_replace will be set to 1 if no-Faulty mreplace exists, and mreplace will be deref later. However, the latter check of mreplace might set mreplace to NULL, null-ptr-deref occurs if need_replace is 1 at this time. Fix it by merging two checks into one. And replace 'need_replace' with 'mreplace' because their values are always the same. Fixes: ee37d7314a32 ("md/raid10: Fix raid10 replace hang when new added disk faulty") Signed-off-by: Li Nan --- drivers/md/raid10.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 4fcfcb350d2b..e21502c03b45 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -3438,7 +3438,6 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, int must_sync; int any_working; int need_recover = 0; - int need_replace = 0; struct raid10_info *mirror = &conf->mirrors[i]; struct md_rdev *mrdev, *mreplace; @@ -3451,10 +3450,10 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, !test_bit(In_sync, &mrdev->flags)) need_recover = 1; if (mreplace != NULL && - !test_bit(Faulty, &mreplace->flags)) - need_replace = 1; + test_bit(Faulty, &mreplace->flags)) + mreplace = NULL; - if (!need_recover && !need_replace) { + if (!need_recover && !mreplace) { rcu_read_unlock(); continue; } @@ -3470,8 +3469,6 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, rcu_read_unlock(); continue; } - if (mreplace && test_bit(Faulty, &mreplace->flags)) - mreplace = NULL; /* Unless we are doing a full sync, or a replacement * we only need to recover the block if it is set in * the bitmap @@ -3594,11 +3591,11 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, bio = r10_bio->devs[1].repl_bio; if (bio) bio->bi_end_io = NULL; - /* Note: if need_replace, then bio + /* Note: if replace is not NULL, then bio * cannot be NULL as r10buf_pool_alloc will * have allocated it. */ - if (!need_replace) + if (!mreplace) break; bio->bi_next = biolist; biolist = bio;