From patchwork Mon Nov 14 07:07:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 19553 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2010139wru; Sun, 13 Nov 2022 23:21:00 -0800 (PST) X-Google-Smtp-Source: AA0mqf6u/oy5Q8JspmsCtsdOED3Mq7AS4AZo7lzFRmLiVpKeL231YnLqbmhC32P4N6BMzKeAMyWI X-Received: by 2002:a63:f84e:0:b0:46e:df6b:b87 with SMTP id v14-20020a63f84e000000b0046edf6b0b87mr10428856pgj.540.1668410460249; Sun, 13 Nov 2022 23:21:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668410460; cv=none; d=google.com; s=arc-20160816; b=L7FBqeBrypi/hvlC+rOW86O+/X16y6SdFsLCqE/YWejOeIA08kkE2tadBM0tUsROnN wE2gxnwLXeFJN2d0tXtqE9IvOu2/sHtc+kpfLwqUPRDaYgsC3YhUggTxkaMKM27HpbIP I0dG3gNeJynDkSP9mz2bkVq6lMg0Tg8p3RjDFuHQU/g355eHs+bQzKXGIlR/jp0zCJdQ /Oz1hDocxnO/DRxW3E9eVmeI0bp6Mcum3nS8iEP8ts3u/Hgy6KL4noM09RjgiHr+NpOZ VccLNZNjNUEnH+uH5gyQr0s375jk2WkrepLlDEYSMQBWi57e8M36uDNtxqoxXfz6CrhN F2iw== 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=SlopBJFxrkwzOBdekVmtR1w8hVSPynJn4hlWGOax6Tw=; b=WAgHu6chIU8cvFvI+HFeCBKUzdLH+RqjNjkgbu68AjxH8P05IBmqhCH9qNdo61i2BK FU42m7Xo8nwTVASzL5CIS8wtr9dFF0Uvt1CSfn9D5Wo/R6ay6Kf66X4Mr35WHyEjYgJH 6k37WJjU2D2PAtJT/UK0GqfPvOULAdbmgsMOI3YrDdJ6ZhpLZuxIcs2JP7u/AOz5aZng ECOwTlrpfCidZWAjeVbTGvUdO8b1F3sBajQOQ9iLOTOw3WEJzU5UICmzxrHaccRuohQx mbKq4YnW7r8hMgkUEMenUwVdPa/IopSyhHNNjmROXjKoj3heBeKuchwAwcCCWs+Yljav TVSQ== 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 v5-20020a170902e8c500b0017bdf43925dsi8500762plg.580.2022.11.13.23.20.47; Sun, 13 Nov 2022 23:21:00 -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 S235636AbiKNHKU (ORCPT + 99 others); Mon, 14 Nov 2022 02:10:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234021AbiKNHKS (ORCPT ); Mon, 14 Nov 2022 02:10:18 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9371512093 for ; Sun, 13 Nov 2022 23:10:17 -0800 (PST) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N9gRl72F2zmVpJ; Mon, 14 Nov 2022 15:09:55 +0800 (CST) Received: from huawei.com (10.67.175.83) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 14 Nov 2022 15:10:15 +0800 From: ruanjinjie To: , , , , CC: Subject: [PATCH] xen: add missing free_irq() in error path Date: Mon, 14 Nov 2022 15:07:02 +0800 Message-ID: <20221114070702.1887144-1-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.67.175.83] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500008.china.huawei.com (7.221.188.139) 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?1749455166763891428?= X-GMAIL-MSGID: =?utf-8?q?1749455166763891428?= free_irq() is missing in case of error, fix that. Signed-off-by: ruanjinjie Reviewed-by: Oleksandr Tyshchenko --- drivers/xen/platform-pci.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c index 18f0ed8b1f93..6ebd819338ec 100644 --- a/drivers/xen/platform-pci.c +++ b/drivers/xen/platform-pci.c @@ -144,7 +144,7 @@ static int platform_pci_probe(struct pci_dev *pdev, if (ret) { dev_warn(&pdev->dev, "Unable to set the evtchn callback " "err=%d\n", ret); - goto out; + goto irq_out; } } @@ -152,13 +152,16 @@ static int platform_pci_probe(struct pci_dev *pdev, grant_frames = alloc_xen_mmio(PAGE_SIZE * max_nr_gframes); ret = gnttab_setup_auto_xlat_frames(grant_frames); if (ret) - goto out; + goto irq_out; ret = gnttab_init(); if (ret) goto grant_out; return 0; grant_out: gnttab_free_auto_xlat_frames(); +irq_out: + if (!xen_have_vector_callback) + free_irq(pdev->irq, pdev); out: pci_release_region(pdev, 0); mem_out: