Commit 27719834 authored by ruanjinjie's avatar ruanjinjie Committed by sanglipeng
Browse files

xen/platform-pci: add missing free_irq() in error path 

stable inclusion
from stable-v5.10.157
commit 4fa717ba2d25ec2a508eb444196c74cc59a15bc1
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7MU59

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4fa717ba2d25ec2a508eb444196c74cc59a15bc1



--------------------------------

[ Upstream commit c53717e1 ]

free_irq() is missing in case of error in platform_pci_probe(), fix that.

Signed-off-by: default avatarruanjinjie <ruanjinjie@huawei.com>
Reviewed-by: default avatarOleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Link: https://lore.kernel.org/r/20221114112124.1965611-1-ruanjinjie@huawei.com


Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent baa34e32

drivers/xen/platform-pci.c

+5 −2
Original line number Diff line number Diff line
@@ -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: