Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CA34BC4332F for ; Wed, 23 Nov 2022 12:44:57 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.447559.703938 (Exim 4.92) (envelope-from ) id 1oxp7Q-0007R7-Ky; Wed, 23 Nov 2022 12:44:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 447559.703938; Wed, 23 Nov 2022 12:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oxp7Q-0007R0-II; Wed, 23 Nov 2022 12:44:48 +0000 Received: by outflank-mailman (input) for mailman id 447559; Wed, 23 Nov 2022 12:44:47 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oxp7P-0007Eq-5V for xen-devel@lists.xenproject.org; Wed, 23 Nov 2022 12:44:47 +0000 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9be6288c-6b2c-11ed-91b6-6bf2151ebd3b; Wed, 23 Nov 2022 13:44:46 +0100 (CET) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5AAF261C5E; Wed, 23 Nov 2022 12:44:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D321FC433C1; Wed, 23 Nov 2022 12:44:43 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9be6288c-6b2c-11ed-91b6-6bf2151ebd3b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669207484; bh=qpcj/yxIVHVz+BB0iIupUGngTEfyrKmT7QUW4WDi3IE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pwaRTxpUVebgapkjE3zGaOmpwrkUHUR3PojUp0iubvRW0+QDbbHN2c3jta4i/Q7CV cKr3A2BTa3AZ76+VQHfmRUZXeEAcWjTgfHZTwfEsqfNBU4KZrgeMGC3znKfv1VHp3E cb8pj7pk8E9ch6BKQsqhIAVDlz05odgXfEeDNvB2m+/O+NyNV8U9qVuQVvLUgPFrkC 8B0V4oYEaBUYtLaGR5XCueePUpgF3Qo3Q+3nx+NLBPpIy8+vqSW4B3qvaTE+hGXESM sCMflxmUjqIv98zueOs9T1suabIVRB1e3TGmQgNZpIADOK+0tuSF01pYLSUY472Hlf JkjxhHEVHgl9g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: ruanjinjie , Oleksandr Tyshchenko , Juergen Gross , Sasha Levin , sstabellini@kernel.org, xen-devel@lists.xenproject.org Subject: [PATCH AUTOSEL 5.4 06/15] xen/platform-pci: add missing free_irq() in error path Date: Wed, 23 Nov 2022 07:44:16 -0500 Message-Id: <20221123124427.266286-6-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221123124427.266286-1-sashal@kernel.org> References: <20221123124427.266286-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: ruanjinjie [ Upstream commit c53717e1e3f0d0f9129b2e0dbc6dcc5e0a8132e9 ] free_irq() is missing in case of error in platform_pci_probe(), fix that. Signed-off-by: ruanjinjie Reviewed-by: Oleksandr Tyshchenko Link: https://lore.kernel.org/r/20221114112124.1965611-1-ruanjinjie@huawei.com Signed-off-by: Juergen Gross Signed-off-by: Sasha Levin --- 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 c45646450135..e1cb277a9e16 100644 --- a/drivers/xen/platform-pci.c +++ b/drivers/xen/platform-pci.c @@ -137,7 +137,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; } } @@ -145,13 +145,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: -- 2.35.1