Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp2957536imw; Sun, 17 Jul 2022 22:01:15 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sx0Ux2814jb8RzSRZ+DaHqJiPAL1py5gWDSr3tJ/UWX1QRtvMc2T+AEPFvMXqxAUWQdRup X-Received: by 2002:a17:90b:4f82:b0:1f0:95d:c029 with SMTP id qe2-20020a17090b4f8200b001f0095dc029mr31207067pjb.66.1658120475402; Sun, 17 Jul 2022 22:01:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658120475; cv=none; d=google.com; s=arc-20160816; b=YnFmHg7rmDQ37+yVq6+LN9GnrX/vrr604sBh4I7SMtPpMOvFItBbxojxJ2frSjjjaf 2Ixe+QQga7aY+JhvmTbtBXc84LZYyKC87UafijYksifRtZj7HLttJoDcDZEv9il9y+go r+a3v7CQ9sq8qW5nKwyxPGY3diQCmxAfYTnA6rX7DBFblpbzwRxXLPupWRzxsBIc8cL9 vBVX+AIP3dPyvq7dWdr124cq/lCBblenp/39Xe6Y1x/aszZoSQ1//K9LdVJqA3qwTUUF pC5aDE2n9iESAjVpsvacyR5O8XpCQlK0N8CPkV3hF7KeaL/Onva0Zz6x+CkURzZa4tsO t29Q== 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 :message-id:date:subject:cc:to:from; bh=aD9Vos6S+4rECOwCvYHAGtOOCOy00RuhIHzuOVIbD7g=; b=xOCYEqwTd+ti3LPNpd8vzI/qifVj5q94yRhdIUaC2OSaopU65Py+htNeRW54S5uIBK k4a1NX3AHWei1okgac5caMEfEWDN0UjktkgtuVP+uCPrcInUzsAY0aGG2yUsHuRR0/Zz x54+6wqkkRZQ0wlD1HN+15+Awy3b7fzp9D1SSTpewj+xu2eSGeWtayloTQPUABH5C6YU Fd9QJ6Muw+qlfcvegR/AxEpQ1z554AelxJdNPbEcqFAwaG19Z4Bt2hozIWMetndv1H3T v+uB/1jaQAJpuqKjoGGh4W8jcmMtWylRvJYSSLNq2FHsWj0EgnoVPYgqVo1srnRVJM2e Na8Q== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w62-20020a638241000000b0041617174afcsi14636295pgd.592.2022.07.17.22.01.01; Sun, 17 Jul 2022 22:01:15 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231556AbiGREO7 (ORCPT + 99 others); Mon, 18 Jul 2022 00:14:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229535AbiGREO5 (ORCPT ); Mon, 18 Jul 2022 00:14:57 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5877765C1; Sun, 17 Jul 2022 21:14:56 -0700 (PDT) Received: from dggpemm500021.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LmT6M6lyFzVfrG; Mon, 18 Jul 2022 12:11:07 +0800 (CST) Received: from dggpemm500007.china.huawei.com (7.185.36.183) by dggpemm500021.china.huawei.com (7.185.36.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 18 Jul 2022 12:14:54 +0800 Received: from huawei.com (10.175.103.91) by dggpemm500007.china.huawei.com (7.185.36.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 18 Jul 2022 12:14:53 +0800 From: Yang Yingliang To: , CC: Subject: [PATCH -next] ublk_drv: fix missing error return code in ublk_add_dev() Date: Mon, 18 Jul 2022 12:24:08 +0800 Message-ID: <20220718042408.3132835-1-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500007.china.huawei.com (7.185.36.183) 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 If blk_mq_init_queue() fails, it should return error code in ublk_add_dev() Fixes: cebbe577cb17 ("ublk_drv: fix request queue leak") Signed-off-by: Yang Yingliang --- drivers/block/ublk_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 52fd0af8a4f2..bea441782cb0 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1169,8 +1169,10 @@ static int ublk_add_dev(struct ublk_device *ub) goto out_deinit_queues; ub->ub_queue = blk_mq_init_queue(&ub->tag_set); - if (IS_ERR(ub->ub_queue)) + if (IS_ERR(ub->ub_queue)) { + err = PTR_ERR(ub->ub_queue); goto out_cleanup_tags; + } ub->ub_queue->queuedata = ub; disk = ub->ub_disk = blk_mq_alloc_disk_for_queue(ub->ub_queue, -- 2.25.1