Commit 00aed0ea authored Aug 26, 2020 by Dinghao Liu Committed by Greg Kroah-Hartman Oct 29, 2020

EDAC/i5100: Fix error handling order in i5100_init_one()



[ Upstream commit 857a3139bd8be4f702c030c8ca06f3fd69c1741a ]

When pci_get_device_func() fails, the driver doesn't need to execute
pci_dev_put(). mci should still be freed, though, to prevent a memory
leak. When pci_enable_device() fails, the error injection PCI device
"einj" doesn't need to be disabled either.

 [ bp: Massage commit message, rename label to "bail_mc_free". ]

Fixes: 52608ba2 ("i5100_edac: probe for device 19 function 0")
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200826121437.31606-1-dinghao.liu@zju.edu.cn


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 1ba6c542

drivers/edac/i5100_edac.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -1072,16 +1072,15 @@ static int i5100_init_one(struct pci_dev pdev, const struct pci_device_id id)
		PCI_DEVICE_ID_INTEL_5100_19, 0);
		if (!einj) {
		ret = -ENODEV;
		goto bail_einj;
		goto bail_mc_free;
		}

		rc = pci_enable_device(einj);
		if (rc < 0) {
		ret = rc;
		goto bail_disable_einj;
		goto bail_einj;
		}


		mci->pdev = &pdev->dev;

		priv = mci->pvt_info;
		@@ -1147,14 +1146,14 @@ static int i5100_init_one(struct pci_dev pdev, const struct pci_device_id id)
		bail_scrub:
		priv->scrub_enable = 0;
		cancel_delayed_work_sync(&(priv->i5100_scrubbing));
		edac_mc_free(mci);

		bail_disable_einj:
		pci_disable_device(einj);

		bail_einj:
		pci_dev_put(einj);

		bail_mc_free:
		edac_mc_free(mci);

		bail_disable_ch1:
		pci_disable_device(ch1mm);