|
@@ -0,0 +1,73 @@
|
|
|
+From b3d0d98179d62f9d55635a600679c4fa362baf8d Mon Sep 17 00:00:00 2001
|
|
|
+From: Yang Yingliang <[email protected]>
|
|
|
+Date: Mon, 17 Oct 2022 11:51:54 +0800
|
|
|
+Subject: [PATCH 1/3] net: ethernet: mtk_eth_soc: fix possible memory leak in
|
|
|
+ mtk_probe()
|
|
|
+
|
|
|
+If mtk_wed_add_hw() has been called, mtk_wed_exit() needs be called
|
|
|
+in error path or removing module to free the memory allocated in
|
|
|
+mtk_wed_add_hw().
|
|
|
+
|
|
|
+Fixes: 804775dfc288 ("net: ethernet: mtk_eth_soc: add support for Wireless Ethernet Dispatch (WED)")
|
|
|
+Signed-off-by: Yang Yingliang <[email protected]>
|
|
|
+Signed-off-by: David S. Miller <[email protected]>
|
|
|
+---
|
|
|
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 17 ++++++++++++-----
|
|
|
+ 1 file changed, 12 insertions(+), 5 deletions(-)
|
|
|
+
|
|
|
+--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
|
++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
|
+@@ -4008,19 +4008,23 @@ static int mtk_probe(struct platform_dev
|
|
|
+ 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;
|
|
|
+ }
|
|
|
+@@ -4031,7 +4035,7 @@ static int mtk_probe(struct platform_dev
|
|
|
+
|
|
|
+ err = mtk_hw_init(eth);
|
|
|
+ if (err)
|
|
|
+- return err;
|
|
|
++ goto err_wed_exit;
|
|
|
+
|
|
|
+ eth->hwlro = MTK_HAS_CAPS(eth->soc->caps, MTK_HWLRO);
|
|
|
+
|
|
|
+@@ -4129,6 +4133,8 @@ err_free_dev:
|
|
|
+ mtk_free_dev(eth);
|
|
|
+ err_deinit_hw:
|
|
|
+ mtk_hw_deinit(eth);
|
|
|
++err_wed_exit:
|
|
|
++ mtk_wed_exit();
|
|
|
+
|
|
|
+ return err;
|
|
|
+ }
|
|
|
+@@ -4148,6 +4154,7 @@ static int mtk_remove(struct platform_de
|
|
|
+ phylink_disconnect_phy(mac->phylink);
|
|
|
+ }
|
|
|
+
|
|
|
++ mtk_wed_exit();
|
|
|
+ mtk_hw_deinit(eth);
|
|
|
+
|
|
|
+ netif_napi_del(ð->tx_napi);
|