Commit 63eec6f9 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'stmmac-dwmac-loongson-fixes-three-leaks' 

Yang Yingliang says:

====================
stmmac: dwmac-loongson: fixes three leaks

patch #2 fixes missing pci_disable_device() in the error path in probe()
patch #1 and pach #3 fix missing pci_disable_msi() and of_node_put() in
error and remove() path.
====================

Link: https://lore.kernel.org/r/20221108114647.4144952-1-yangyingliang@huawei.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents c6092ea1 7f94d049

drivers/net/ethernet/stmicro/stmmac/dwmac-loongson.c

+31 −8
Original line number Diff line number Diff line
@@ -75,20 +75,24 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id 
		plat->mdio_bus_data = devm_kzalloc(&pdev->dev,

						   sizeof(*plat->mdio_bus_data),

						   GFP_KERNEL);

		if (!plat->mdio_bus_data)

			return -ENOMEM;

		if (!plat->mdio_bus_data) {

			ret = -ENOMEM;

			goto err_put_node;

		}

		plat->mdio_bus_data->needs_reset = true;

	}



	plat->dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*plat->dma_cfg), GFP_KERNEL);

	if (!plat->dma_cfg)

		return -ENOMEM;

	if (!plat->dma_cfg) {

		ret = -ENOMEM;

		goto err_put_node;

	}



	/* Enable pci device */

	ret = pci_enable_device(pdev);

	if (ret) {

		dev_err(&pdev->dev, "%s: ERROR: failed to enable device\n", __func__);

		return ret;

		goto err_put_node;

	}



	/* Get the base address of device */
@@ -97,7 +101,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id 
			continue;

		ret = pcim_iomap_regions(pdev, BIT(0), pci_name(pdev));

		if (ret)

			return ret;

			goto err_disable_device;

		break;

	}
@@ -108,7 +112,8 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id 
	phy_mode = device_get_phy_mode(&pdev->dev);

	if (phy_mode < 0) {

		dev_err(&pdev->dev, "phy_mode not found\n");

		return phy_mode;

		ret = phy_mode;

		goto err_disable_device;

	}



	plat->phy_interface = phy_mode;
@@ -125,6 +130,7 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id 
	if (res.irq < 0) {

		dev_err(&pdev->dev, "IRQ macirq not found\n");

		ret = -ENODEV;

		goto err_disable_msi;

	}



	res.wol_irq = of_irq_get_byname(np, "eth_wake_irq");
@@ -137,15 +143,31 @@ static int loongson_dwmac_probe(struct pci_dev *pdev, const struct pci_device_id 
	if (res.lpi_irq < 0) {

		dev_err(&pdev->dev, "IRQ eth_lpi not found\n");

		ret = -ENODEV;

		goto err_disable_msi;

	}



	return stmmac_dvr_probe(&pdev->dev, plat, &res);

	ret = stmmac_dvr_probe(&pdev->dev, plat, &res);

	if (ret)

		goto err_disable_msi;



	return ret;



err_disable_msi:

	pci_disable_msi(pdev);

err_disable_device:

	pci_disable_device(pdev);

err_put_node:

	of_node_put(plat->mdio_node);

	return ret;

}



static void loongson_dwmac_remove(struct pci_dev *pdev)

{

	struct net_device *ndev = dev_get_drvdata(&pdev->dev);

	struct stmmac_priv *priv = netdev_priv(ndev);

	int i;



	of_node_put(priv->plat->mdio_node);

	stmmac_dvr_remove(&pdev->dev);



	for (i = 0; i < PCI_STD_NUM_BARS; i++) {
@@ -155,6 +177,7 @@ static void loongson_dwmac_remove(struct pci_dev *pdev) 
		break;

	}



	pci_disable_msi(pdev);

	pci_disable_device(pdev);

}