From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92666C4167D for ; Wed, 23 Nov 2022 12:43:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237106AbiKWMnp (ORCPT ); Wed, 23 Nov 2022 07:43:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237136AbiKWMmp (ORCPT ); Wed, 23 Nov 2022 07:42:45 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A4F467F6F; Wed, 23 Nov 2022 04:41:51 -0800 (PST) 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 14DD261C1D; Wed, 23 Nov 2022 12:41:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 946FBC43470; Wed, 23 Nov 2022 12:41:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669207310; bh=qhyl/ggZQXJL45HqOXJfkODiufFbxtVKPvB+MTZPIaY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mr9FOQpdXUzqr7Qs+c7L44VJUnf1ARIMvj7NHceZwtBD4umWqqlcVndpS3IY8RkaP WOisUGqRu1dx6wU6nlgksIA6IVrfeqYtusEMlsP13ErvrfGexC9RA3z1HZdp2z6a7L Xphuj7AqDjWlZnP4IFGi9XEIJDGMFQRaIAnqWKodUMQq5YEzew1q62Uq2BU4lCnSQV 9Z7vBtlw5UipZ4Keq3rjDVKqmYr3q+XEPabEMgnGy7FXmV62LH96/8yvSPeT0IKWJg 4I8ThBTOOTwtB85LWsJhO7boP3zHhGjnt+TlmU/EtI3Q/8n+D8++wyXgRix2cvajZP fdzL2MAI6mh4w== 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 6.0 21/44] xen/platform-pci: add missing free_irq() in error path Date: Wed, 23 Nov 2022 07:40:30 -0500 Message-Id: <20221123124057.264822-21-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221123124057.264822-1-sashal@kernel.org> References: <20221123124057.264822-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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: -- 2.35.1