Commit a887b59f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mtk_eth_wed-leak-fixes' 



Yang Yingliang says:

====================
net: ethernet: mtk_eth_wed: fixe some leaks

I found some leaks in mtk_eth_soc.c/mtk_wed.c.

 patch#1 - I found mtk_wed_exit() is never called, I think mtk_wed_exit() need
           be called in error path or module remove function to free the memory
           allocated in mtk_wed_add_hw().

 patch#2 - The device is not put in error path in mtk_wed_add_hw().

 patch#3 - The device_node pointer returned by of_parse_phandle() with refcount
           incremented, it should be decreased when it done.

This patchset was just compiled tested because I don't have any HW on
which to do the actual tests.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2d1f274b e0bb4659

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+12 −5
Original line number Diff line number Diff line
@@ -4060,19 +4060,23 @@ static int mtk_probe(struct platform_device *pdev) 
			eth->irq[i] = platform_get_irq(pdev, i);

		if (eth->irq[i] < 0) {

			dev_err(&pdev->dev, "no IRQ%d resource found\n", i);

			return -ENXIO;

			err = -ENXIO;

			goto err_wed_exit;

		}

	}

	for (i = 0; i < ARRAY_SIZE(eth->clks); i++) {

		eth->clks[i] = devm_clk_get(eth->dev,

					    mtk_clks_source_name[i]);

		if (IS_ERR(eth->clks[i])) {

			if (PTR_ERR(eth->clks[i]) == -EPROBE_DEFER)

				return -EPROBE_DEFER;

			if (PTR_ERR(eth->clks[i]) == -EPROBE_DEFER) {

				err = -EPROBE_DEFER;

				goto err_wed_exit;

			}

			if (eth->soc->required_clks & BIT(i)) {

				dev_err(&pdev->dev, "clock %s not found\n",

					mtk_clks_source_name[i]);

				return -EINVAL;

				err = -EINVAL;

				goto err_wed_exit;

			}

			eth->clks[i] = NULL;

		}
@@ -4083,7 +4087,7 @@ static int mtk_probe(struct platform_device *pdev) 


	err = mtk_hw_init(eth);

	if (err)

		return err;

		goto err_wed_exit;



	eth->hwlro = MTK_HAS_CAPS(eth->soc->caps, MTK_HWLRO);
@@ -4179,6 +4183,8 @@ static int mtk_probe(struct platform_device *pdev) 
	mtk_free_dev(eth);

err_deinit_hw:

	mtk_hw_deinit(eth);

err_wed_exit:

	mtk_wed_exit();



	return err;

}
@@ -4198,6 +4204,7 @@ static int mtk_remove(struct platform_device *pdev) 
		phylink_disconnect_phy(mac->phylink);

	}



	mtk_wed_exit();

	mtk_hw_deinit(eth);



	netif_napi_del(&eth->tx_napi);

drivers/net/ethernet/mediatek/mtk_wed.c

+12 −3
Original line number Diff line number Diff line
@@ -1072,16 +1072,16 @@ void mtk_wed_add_hw(struct device_node *np, struct mtk_eth *eth, 


	pdev = of_find_device_by_node(np);

	if (!pdev)

		return;

		goto err_of_node_put;



	get_device(&pdev->dev);

	irq = platform_get_irq(pdev, 0);

	if (irq < 0)

		return;

		goto err_put_device;



	regs = syscon_regmap_lookup_by_phandle(np, NULL);

	if (IS_ERR(regs))

		return;

		goto err_put_device;



	rcu_assign_pointer(mtk_soc_wed_ops, &wed_ops);
@@ -1124,8 +1124,16 @@ void mtk_wed_add_hw(struct device_node *np, struct mtk_eth *eth, 


	hw_list[index] = hw;



	mutex_unlock(&hw_lock);



	return;



unlock:

	mutex_unlock(&hw_lock);

err_put_device:

	put_device(&pdev->dev);

err_of_node_put:

	of_node_put(np);

}



void mtk_wed_exit(void)
@@ -1146,6 +1154,7 @@ void mtk_wed_exit(void) 
		hw_list[i] = NULL;

		debugfs_remove(hw->debugfs_dir);

		put_device(hw->dev);

		of_node_put(hw->node);

		kfree(hw);

	}

}