From patchwork Sat May 27 07:22:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Nan X-Patchwork-Id: 99800 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp193267vqr; Sat, 27 May 2023 00:59:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6DU24kj/vkp8W1lMteo7R3scOHQLLwvSFKIto3QH5Dm5zA92CBnYWYAyyUbMpNmp0DmLMe X-Received: by 2002:a05:6a00:802:b0:647:24a2:2128 with SMTP id m2-20020a056a00080200b0064724a22128mr6629696pfk.11.1685174380675; Sat, 27 May 2023 00:59:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685174380; cv=none; d=google.com; s=arc-20160816; b=po/ohxs5ROBzmKXawrMruav8KywlczB6DgMshz6Zq0LeMDhoBBY4F0XZIRjl1AbZ9v 4N8qa82ot+OXPUWFECStt8GfuvOl/tUnoRtUI5JPXyj6/Cdo/tJC2uAJoT5wLazGWQ+G uCJxvcnfLJTjE8LbvxkwzrTS3Ljp8LlB76mpsDgMUxh/7YzcFSveg99gJwkZ0jWj/T2k nxR8ZNFtcigDhM5Jykk3SXOXLI+uYbf82Y2jIYUsT9kr8zMepw+sRSwIzxiNFhDeNyze /5jB6RWvuSWJ7csVNpAKmB0IF4Z3SEmm2PYY6yh8mVWfD2xLdxf3JxQo7V7WdySPZJcD eslw== 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=yy3BRlQuR84Srwpt20LKqSdtX81IHZPpoJRRb4hVZZo=; b=Af8T8vkzmihRRXQVXJ3U2Mm+Ljod5JpDQTwYHRne+kwpbu5cBqffTahOco6nnbvWXa sTEKdnhKoYgq20w29IO4IQeN+g8XF6STk/lnl7vX/HMdFXuk6fVKVPVlz7fTWabV+rDb 6Mst8cUGDunvn3ToKKr1l9GVvHZvZJ0oJpFgRZ86ZDZp1+M8Ehb42zgIavjkH3530QK4 Tc3yDoyNXu8gJmYmSxwRowh5RHM+EQrlePObzC9dkHFNwQ5HziwW1LdICVv8zPRzX6Kb 2OBo7eYJ2kjgDc/PVZZKkgqmXHxcXnP6C8IXy619dTNjaiC/qZsBNixi9cQtlPqit8Tj 6lwQ== 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 r1-20020aa79621000000b0063d48d82e85si6307476pfg.15.2023.05.27.00.59.28; Sat, 27 May 2023 00:59:40 -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 S234267AbjE0HmB (ORCPT + 99 others); Sat, 27 May 2023 03:42:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232327AbjE0Hll (ORCPT ); Sat, 27 May 2023 03:41:41 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C317C9; Sat, 27 May 2023 00:41:40 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4QStZN1r8Xz4f3w0G; Sat, 27 May 2023 15:23:56 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgD3rLAKsHFk67lAKQ--.30654S5; Sat, 27 May 2023 15:23:57 +0800 (CST) From: linan666@huaweicloud.com To: song@kernel.org, bingjingc@synology.com, allenpeng@synology.com, shli@fb.com, alexwu@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 v3 1/4] md/raid10: fix null-ptr-deref of mreplace in raid10_sync_request Date: Sat, 27 May 2023 15:22:15 +0800 Message-Id: <20230527072218.2365857-2-linan666@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230527072218.2365857-1-linan666@huaweicloud.com> References: <20230527072218.2365857-1-linan666@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgD3rLAKsHFk67lAKQ--.30654S5 X-Coremail-Antispam: 1UD129KBjvJXoW7CFWDZw45AFyrZr45uFy8Zrb_yoW5JrWDpa y3tF9rJ34UG3yjka1DJ3ZruF1S9asrJw15Cry5W343Zr1agrWDCay8WFWYqFyDXF4Yvw4Y qw1jyws8CFy7Xa7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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?1767033411313695230?= X-GMAIL-MSGID: =?utf-8?q?1767033411313695230?= From: Li Nan There are two check of 'mreplace' in raid10_sync_request(). In the first check, 'need_replace' will be set and 'mreplace' will be used later if no-Faulty 'mreplace' exists, In the second check, 'mreplace' will be set to NULL if it is Faulty, but 'need_replace' will not be changed accordingly. null-ptr-deref occurs if Faulty is set between two check. 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 Reviewed-by: Yu Kuai --- drivers/md/raid10.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 4fcfcb350d2b..0acb4c103c10 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; @@ -3450,11 +3449,10 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, !test_bit(Faulty, &mrdev->flags) && !test_bit(In_sync, &mrdev->flags)) need_recover = 1; - if (mreplace != NULL && - !test_bit(Faulty, &mreplace->flags)) - need_replace = 1; + if (mreplace && test_bit(Faulty, &mreplace->flags)) + mreplace = NULL; - if (!need_recover && !need_replace) { + if (!need_recover && !mreplace) { rcu_read_unlock(); continue; } @@ -3470,8 +3468,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 +3590,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;