From patchwork Wed Nov 30 13:21:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Li Nan X-Patchwork-Id: 27786 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp909440wrr; Wed, 30 Nov 2022 05:02:24 -0800 (PST) X-Google-Smtp-Source: AA0mqf6KLBTJFFPVLM4c00C9d1Fi/o3SEg5XR7PZQ0JgABf8cIUU8J7QCj3mJqabEjKdVBWz+OHA X-Received: by 2002:a63:5308:0:b0:46f:cec6:8805 with SMTP id h8-20020a635308000000b0046fcec68805mr37979933pgb.612.1669813344211; Wed, 30 Nov 2022 05:02:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669813344; cv=none; d=google.com; s=arc-20160816; b=RbjrU3RvKGEz3WH0Cz8U5hi/xdQB9KhFthLGixxxEZO//KHPpnSxbWL71gkXbNiCcu Wa+9eC65onLWoczgbjEaJITjBhJFZ+fJL8+3mVtOoA+vrt9yxmqBuB/s/ovuxKzv0GQW uuaj+UwWIDQ5JcAZHI6OipbPpwnUdhL97/sWa8O+zKTfeEXHiojxH2f+K+vWMjdgVQeZ HeRIo7mH2xTnNbzwX7Kl5n285CDl3AxOGRrnh6ofT6w6bin2XPrK9OHA/SCCDOpkMXZx NkJc+lgEvgG4eWpmd0hJmM/pb+aadvBDt0p7jv3lAlTYg3zX9xSUtGASCjFM52oA718q 0Oag== 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=MMUIHipO+ixyCCOtLxkU84axM/dUNdIPeQzLp6D81hs=; b=Rxi/z7fzhkh+mFl8dRsFGjGe38fAzI7BaU6ousAOCp2kIQwovQMPRSKqjCILDzKWel 38cAH8lJQwZxuA4/G73HtyI51RXCeBDd+ih3ENmJgEHR2HpOI7G9Mp5qXMBfUqAnJcaK zHmIHbr4QJjgo/mBZFShM99T17IlLCB4EGJK8mHpFbJxSIqAjxyGkHb38pjJKr5L6Zfe hmgftG29usPnhOdprwCp/ztL4f292wt+IG56SqEXvNFoCgF2E3TzvWwsKoq1StPCCYg/ C9nQFU7inFiJ9BxG+TySOwO6hZ62sfy0p5O6WmmOgGyvefoUVsqdUxAss7doZFbtW6cj vThA== 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k9-20020a170902760900b001869fd74e0csi1160072pll.311.2022.11.30.05.02.09; Wed, 30 Nov 2022 05:02:24 -0800 (PST) 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235757AbiK3NB0 (ORCPT + 99 others); Wed, 30 Nov 2022 08:01:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234500AbiK3NA6 (ORCPT ); Wed, 30 Nov 2022 08:00:58 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EDFF4E421; Wed, 30 Nov 2022 05:00:56 -0800 (PST) Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NMfPR28XyzJp39; Wed, 30 Nov 2022 20:57:31 +0800 (CST) Received: from dggpeml500003.china.huawei.com (7.185.36.200) by dggpeml500021.china.huawei.com (7.185.36.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 30 Nov 2022 21:00:54 +0800 Received: from huawei.com (10.175.127.227) by dggpeml500003.china.huawei.com (7.185.36.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 30 Nov 2022 21:00:54 +0800 From: Li Nan To: , , CC: , , , , , Subject: [PATCH -next v2 8/9] block: fix null-pointer dereference in ioc_pd_init Date: Wed, 30 Nov 2022 21:21:55 +0800 Message-ID: <20221130132156.2836184-9-linan122@huawei.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221130132156.2836184-1-linan122@huawei.com> References: <20221130132156.2836184-1-linan122@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500003.china.huawei.com (7.185.36.200) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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?1750926197194870938?= X-GMAIL-MSGID: =?utf-8?q?1750926197194870938?= Remove block device when iocost is initializing may cause null-pointer dereference: CPU1 CPU2 ioc_qos_write blkcg_conf_open_bdev blkdev_get_no_open kobject_get_unless_zero blk_iocost_init rq_qos_add del_gendisk rq_qos_exit q->rq_qos = rqos->next //iocost is removed from q->roqs blkcg_activate_policy pd_init_fn ioc_pd_init ioc = q_to_ioc(blkg->q) //cant find iocost and return null Fix problem by moving rq_qos_exit() to disk_release(). ioc_qos_write() get bd_device.kobj in blkcg_conf_open_bdev(), so disk_release will not be actived until iocost initialization is complited. Signed-off-by: Li Nan --- block/genhd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/genhd.c b/block/genhd.c index dcf200bcbd3e..0db440bbfefb 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -656,7 +656,6 @@ void del_gendisk(struct gendisk *disk) elevator_exit(q); mutex_unlock(&q->sysfs_lock); } - rq_qos_exit(q); blk_mq_unquiesce_queue(q); /* @@ -1168,6 +1167,7 @@ static void disk_release(struct device *dev) !test_bit(GD_ADDED, &disk->state)) blk_mq_exit_queue(disk->queue); + rq_qos_exit(disk->queue); blkcg_exit_disk(disk); bioset_exit(&disk->bio_split);