From patchwork Fri Aug 25 03:09:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 136901 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp1602644vqm; Thu, 24 Aug 2023 23:21:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE/u/mo6p61MO9G7A41T1p+ZJKBZY22vZH3xNwLmlQT9eHu+Xm/GQlp334CTooskosuUjZg X-Received: by 2002:a05:6a00:1993:b0:68c:6a2:f1d4 with SMTP id d19-20020a056a00199300b0068c06a2f1d4mr1439111pfl.31.1692944478781; Thu, 24 Aug 2023 23:21:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692944478; cv=none; d=google.com; s=arc-20160816; b=JUUcR5m1w12ecXFx6IXOp6bkYi89qfnmMEPWhHiPyYLCAX189cXRwGstJcSNiQcuBt iqhipSi1k0DPdjrVsKWZGTnPeyOoTafHZdoLEFczz+AnIDW6OGka3P87ptwcD2xVC3aU LIbAwvfbXHaraKqTY5f1PKCSoF9++g+sjMK6tvhoJ60Liy3B8r7eI8PvAsKt4Kd91cfr yeg/YKuGXTnmZego6vl31yiDJRp9jxztlXGrXSxoRmYGaba7ROrfg994hp5Oww8QfAUY sy98g0cxBpzrMsxlf275mEADfxIobwY9T7ePF2QFRuKIS2c3dUhqMNaT+vjmavrnjBTw u+ZQ== 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=6OkVR3CuCKCLyvRu2fLR9G1Is9Wp1YLibFId/AXbaD4=; fh=Iai7sXcASX3vRWvXi9iTVx43AsdXJbnGycmlmAlQPKE=; b=gSKAH1CFSc7N1OFfEvGyQRUsO0AyRED+GokN7h1812lSIpinq7nDVnDc+JNtGw7qhD Nkyl8+SikBovlm0AGqZOpYiA0Goocga36npXkezVyowH9yl5DyXpKHULQkknldL33c6d A47l4kTtVO43dkFdTEwWmMxtbjJQn+YR6S2ZT2nJChPzxPHxDkvmP3M4ePhqwgxWi4e1 xn7ah80j25VGXKlizLK6ukeKw0ow5CRbn4mbt1N7FWdBSKyLpe1XqdFXSxfZKsz6/bGB QqT1Oe+Rte1AWb2sAsqDyxvtaqnpY6xYV0LFqR6J8QOHTvG3qV/xnkFWcN0kg8zzjmUI uq/Q== 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 e10-20020aa7824a000000b0068708f54862si1144733pfn.48.2023.08.24.23.21.09; Thu, 24 Aug 2023 23:21:18 -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 S237231AbjHYDOh (ORCPT + 57 others); Thu, 24 Aug 2023 23:14:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233966AbjHYDOS (ORCPT ); Thu, 24 Aug 2023 23:14:18 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CD641BDA; Thu, 24 Aug 2023 20:14:16 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RX4mh56Hwz4f3l8d; Fri, 25 Aug 2023 11:14:12 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgAnBah_HOhkveEWBg--.3212S7; Fri, 25 Aug 2023 11:14:13 +0800 (CST) From: Yu Kuai To: agk@redhat.com, snitzer@kernel.org, dm-devel@redhat.com, song@kernel.org, xni@redhat.com Cc: linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH -next v2 3/7] md: don't rely on 'mddev->pers' to be set in mddev_suspend() Date: Fri, 25 Aug 2023 11:09:52 +0800 Message-Id: <20230825030956.1527023-4-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230825030956.1527023-1-yukuai1@huaweicloud.com> References: <20230825030956.1527023-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAnBah_HOhkveEWBg--.3212S7 X-Coremail-Antispam: 1UD129KBjvdXoWrKFy8XFyDGr15urWkZr18Krg_yoWkZFgEgF s8u34DXr10vF9rKrn0qa1Fvry5KFn8WwsrZFyrCryftF95Jry0yF95Ww1Yqwn2yrZrJa4U tryUKr17Ars5XjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb6kFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY02 0Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVWxJr0_GcWl84 ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I2 62IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcV AFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG 0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxcIEc7CjxVA2Y2ka0xkIwI 1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWU JVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7V AKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42 IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUojjgUUUUU X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,MAY_BE_FORGED, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE 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: INBOX X-GMAIL-THRID: 1775180949786638478 X-GMAIL-MSGID: 1775180949786638478 From: Yu Kuai 'active_io' used to be initialized while the array is running, and 'mddev->pers' is set while the array is running as well. Hence caller must hold 'reconfig_mutex' and guarantee 'mddev->pers' is set before calling mddev_suspend(). Now that 'active_io' is initialized when mddev is allocated, such restriction doesn't exist anymore. In the meantime, follow up patches will refactor mddev_suspend(), hence add checking for 'mddev->pers' to prevent null-ptr-deref. Signed-off-by: Yu Kuai --- drivers/md/md.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index e6faeb73172d..e787900d51d7 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -449,7 +449,7 @@ void mddev_suspend(struct mddev *mddev) set_bit(MD_ALLOW_SB_UPDATE, &mddev->flags); percpu_ref_kill(&mddev->active_io); - if (mddev->pers->prepare_suspend) + if (mddev->pers && mddev->pers->prepare_suspend) mddev->pers->prepare_suspend(mddev); wait_event(mddev->sb_wait, percpu_ref_is_zero(&mddev->active_io));