* [PATCH] net: ethernet: fix potential memory leak in gemini_ethernet_port_probe()
@ 2020-07-29 3:46 ` Lu Wei
0 siblings, 0 replies; 4+ messages in thread
From: Lu Wei @ 2020-07-29 3:46 UTC (permalink / raw)
To: ulli.kroll, linus.walleij, davem, kuba, mirq-linux,
linux-arm-kernel, netdev, linux-kernel
If some processes in gemini_ethernet_port_probe() fail,
free_netdev(dev) needs to be called to avoid a memory leak.
Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Lu Wei <luwei32@huawei.com>
---
drivers/net/ethernet/cortina/gemini.c | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c
index 8d13ea370db1..5e93a1a570b6 100644
--- a/drivers/net/ethernet/cortina/gemini.c
+++ b/drivers/net/ethernet/cortina/gemini.c
@@ -2407,37 +2407,48 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
dmares = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!dmares) {
dev_err(dev, "no DMA resource\n");
+ free_netdev(netdev);
return -ENODEV;
}
port->dma_base = devm_ioremap_resource(dev, dmares);
- if (IS_ERR(port->dma_base))
+ if (IS_ERR(port->dma_base)) {
+ free_netdev(netdev);
return PTR_ERR(port->dma_base);
+ }
/* GMAC config memory */
gmacres = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (!gmacres) {
dev_err(dev, "no GMAC resource\n");
+ free_netdev(netdev);
return -ENODEV;
}
port->gmac_base = devm_ioremap_resource(dev, gmacres);
- if (IS_ERR(port->gmac_base))
+ if (IS_ERR(port->gmac_base)) {
+ free_netdev(netdev);
return PTR_ERR(port->gmac_base);
+ }
/* Interrupt */
irq = platform_get_irq(pdev, 0);
- if (irq <= 0)
+ if (irq <= 0) {
+ free_netdev(netdev);
return irq ? irq : -ENODEV;
+ }
port->irq = irq;
/* Clock the port */
port->pclk = devm_clk_get(dev, "PCLK");
if (IS_ERR(port->pclk)) {
dev_err(dev, "no PCLK\n");
+ free_netdev(netdev);
return PTR_ERR(port->pclk);
}
ret = clk_prepare_enable(port->pclk);
- if (ret)
+ if (ret) {
+ free_netdev(netdev);
return ret;
+ }
/* Maybe there is a nice ethernet address we should use */
gemini_port_save_mac_addr(port);
@@ -2446,6 +2457,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
port->reset = devm_reset_control_get_exclusive(dev, NULL);
if (IS_ERR(port->reset)) {
dev_err(dev, "no reset\n");
+ free_netdev(netdev);
return PTR_ERR(port->reset);
}
reset_control_reset(port->reset);
@@ -2501,8 +2513,10 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
IRQF_SHARED,
port_names[port->id],
port);
- if (ret)
+ if (ret) {
+ free_netdev(netdev);
return ret;
+ }
ret = register_netdev(netdev);
if (!ret) {
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] net: ethernet: fix potential memory leak in gemini_ethernet_port_probe()
@ 2020-07-29 3:46 ` Lu Wei
0 siblings, 0 replies; 4+ messages in thread
From: Lu Wei @ 2020-07-29 3:46 UTC (permalink / raw)
To: ulli.kroll, linus.walleij, davem, kuba, mirq-linux,
linux-arm-kernel, netdev, linux-kernel
If some processes in gemini_ethernet_port_probe() fail,
free_netdev(dev) needs to be called to avoid a memory leak.
Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Lu Wei <luwei32@huawei.com>
---
drivers/net/ethernet/cortina/gemini.c | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c
index 8d13ea370db1..5e93a1a570b6 100644
--- a/drivers/net/ethernet/cortina/gemini.c
+++ b/drivers/net/ethernet/cortina/gemini.c
@@ -2407,37 +2407,48 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
dmares = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!dmares) {
dev_err(dev, "no DMA resource\n");
+ free_netdev(netdev);
return -ENODEV;
}
port->dma_base = devm_ioremap_resource(dev, dmares);
- if (IS_ERR(port->dma_base))
+ if (IS_ERR(port->dma_base)) {
+ free_netdev(netdev);
return PTR_ERR(port->dma_base);
+ }
/* GMAC config memory */
gmacres = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (!gmacres) {
dev_err(dev, "no GMAC resource\n");
+ free_netdev(netdev);
return -ENODEV;
}
port->gmac_base = devm_ioremap_resource(dev, gmacres);
- if (IS_ERR(port->gmac_base))
+ if (IS_ERR(port->gmac_base)) {
+ free_netdev(netdev);
return PTR_ERR(port->gmac_base);
+ }
/* Interrupt */
irq = platform_get_irq(pdev, 0);
- if (irq <= 0)
+ if (irq <= 0) {
+ free_netdev(netdev);
return irq ? irq : -ENODEV;
+ }
port->irq = irq;
/* Clock the port */
port->pclk = devm_clk_get(dev, "PCLK");
if (IS_ERR(port->pclk)) {
dev_err(dev, "no PCLK\n");
+ free_netdev(netdev);
return PTR_ERR(port->pclk);
}
ret = clk_prepare_enable(port->pclk);
- if (ret)
+ if (ret) {
+ free_netdev(netdev);
return ret;
+ }
/* Maybe there is a nice ethernet address we should use */
gemini_port_save_mac_addr(port);
@@ -2446,6 +2457,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
port->reset = devm_reset_control_get_exclusive(dev, NULL);
if (IS_ERR(port->reset)) {
dev_err(dev, "no reset\n");
+ free_netdev(netdev);
return PTR_ERR(port->reset);
}
reset_control_reset(port->reset);
@@ -2501,8 +2513,10 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
IRQF_SHARED,
port_names[port->id],
port);
- if (ret)
+ if (ret) {
+ free_netdev(netdev);
return ret;
+ }
ret = register_netdev(netdev);
if (!ret) {
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] net: ethernet: fix potential memory leak in gemini_ethernet_port_probe()
2020-07-29 3:46 ` Lu Wei
@ 2020-07-29 10:02 ` Jisheng Zhang
-1 siblings, 0 replies; 4+ messages in thread
From: Jisheng Zhang @ 2020-07-29 10:02 UTC (permalink / raw)
To: Lu Wei
Cc: ulli.kroll, linus.walleij, davem, kuba, mirq-linux,
linux-arm-kernel, netdev, linux-kernel
On Wed, 29 Jul 2020 11:46:06 +0800 Lu Wei wrote:
>
>
> If some processes in gemini_ethernet_port_probe() fail,
> free_netdev(dev) needs to be called to avoid a memory leak.
Using devm_alloc_etherdev_mqs() would be much simpler
>
> Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Lu Wei <luwei32@huawei.com>
> ---
> drivers/net/ethernet/cortina/gemini.c | 24 +++++++++++++++++++-----
> 1 file changed, 19 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c
> index 8d13ea370db1..5e93a1a570b6 100644
> --- a/drivers/net/ethernet/cortina/gemini.c
> +++ b/drivers/net/ethernet/cortina/gemini.c
> @@ -2407,37 +2407,48 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
> dmares = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> if (!dmares) {
> dev_err(dev, "no DMA resource\n");
> + free_netdev(netdev);
> return -ENODEV;
> }
> port->dma_base = devm_ioremap_resource(dev, dmares);
> - if (IS_ERR(port->dma_base))
> + if (IS_ERR(port->dma_base)) {
> + free_netdev(netdev);
> return PTR_ERR(port->dma_base);
> + }
>
> /* GMAC config memory */
> gmacres = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> if (!gmacres) {
> dev_err(dev, "no GMAC resource\n");
> + free_netdev(netdev);
> return -ENODEV;
> }
> port->gmac_base = devm_ioremap_resource(dev, gmacres);
> - if (IS_ERR(port->gmac_base))
> + if (IS_ERR(port->gmac_base)) {
> + free_netdev(netdev);
> return PTR_ERR(port->gmac_base);
> + }
>
> /* Interrupt */
> irq = platform_get_irq(pdev, 0);
> - if (irq <= 0)
> + if (irq <= 0) {
> + free_netdev(netdev);
> return irq ? irq : -ENODEV;
> + }
> port->irq = irq;
>
> /* Clock the port */
> port->pclk = devm_clk_get(dev, "PCLK");
> if (IS_ERR(port->pclk)) {
> dev_err(dev, "no PCLK\n");
> + free_netdev(netdev);
> return PTR_ERR(port->pclk);
> }
> ret = clk_prepare_enable(port->pclk);
> - if (ret)
> + if (ret) {
> + free_netdev(netdev);
> return ret;
> + }
>
> /* Maybe there is a nice ethernet address we should use */
> gemini_port_save_mac_addr(port);
> @@ -2446,6 +2457,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
> port->reset = devm_reset_control_get_exclusive(dev, NULL);
> if (IS_ERR(port->reset)) {
> dev_err(dev, "no reset\n");
> + free_netdev(netdev);
> return PTR_ERR(port->reset);
> }
> reset_control_reset(port->reset);
> @@ -2501,8 +2513,10 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
> IRQF_SHARED,
> port_names[port->id],
> port);
> - if (ret)
> + if (ret) {
> + free_netdev(netdev);
> return ret;
> + }
>
> ret = register_netdev(netdev);
> if (!ret) {
> --
> 2.17.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> https://urldefense.proofpoint.com/v2/url?u=http-3A__lists.infradead.org_mailman_listinfo_linux-2Darm-2Dkernel&d=DwICAg&c=7dfBJ8cXbWjhc0BhImu8wQ&r=wlaKTGoVCDxOzHc2QUzpzGEf9oY3eidXlAe3OF1omvo&m=56ruRjtNY-BIzquRyoO0KSbrR7UBB81VfqotT_rfFus&s=Axiqv0SZYKFXgMc1zJLilZCk9wbRAt4LkKtW6VjKTgw&e=
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net: ethernet: fix potential memory leak in gemini_ethernet_port_probe()
@ 2020-07-29 10:02 ` Jisheng Zhang
0 siblings, 0 replies; 4+ messages in thread
From: Jisheng Zhang @ 2020-07-29 10:02 UTC (permalink / raw)
To: Lu Wei
Cc: davem, netdev, ulli.kroll, linux-kernel, mirq-linux, kuba,
linus.walleij, linux-arm-kernel
On Wed, 29 Jul 2020 11:46:06 +0800 Lu Wei wrote:
>
>
> If some processes in gemini_ethernet_port_probe() fail,
> free_netdev(dev) needs to be called to avoid a memory leak.
Using devm_alloc_etherdev_mqs() would be much simpler
>
> Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Lu Wei <luwei32@huawei.com>
> ---
> drivers/net/ethernet/cortina/gemini.c | 24 +++++++++++++++++++-----
> 1 file changed, 19 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c
> index 8d13ea370db1..5e93a1a570b6 100644
> --- a/drivers/net/ethernet/cortina/gemini.c
> +++ b/drivers/net/ethernet/cortina/gemini.c
> @@ -2407,37 +2407,48 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
> dmares = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> if (!dmares) {
> dev_err(dev, "no DMA resource\n");
> + free_netdev(netdev);
> return -ENODEV;
> }
> port->dma_base = devm_ioremap_resource(dev, dmares);
> - if (IS_ERR(port->dma_base))
> + if (IS_ERR(port->dma_base)) {
> + free_netdev(netdev);
> return PTR_ERR(port->dma_base);
> + }
>
> /* GMAC config memory */
> gmacres = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> if (!gmacres) {
> dev_err(dev, "no GMAC resource\n");
> + free_netdev(netdev);
> return -ENODEV;
> }
> port->gmac_base = devm_ioremap_resource(dev, gmacres);
> - if (IS_ERR(port->gmac_base))
> + if (IS_ERR(port->gmac_base)) {
> + free_netdev(netdev);
> return PTR_ERR(port->gmac_base);
> + }
>
> /* Interrupt */
> irq = platform_get_irq(pdev, 0);
> - if (irq <= 0)
> + if (irq <= 0) {
> + free_netdev(netdev);
> return irq ? irq : -ENODEV;
> + }
> port->irq = irq;
>
> /* Clock the port */
> port->pclk = devm_clk_get(dev, "PCLK");
> if (IS_ERR(port->pclk)) {
> dev_err(dev, "no PCLK\n");
> + free_netdev(netdev);
> return PTR_ERR(port->pclk);
> }
> ret = clk_prepare_enable(port->pclk);
> - if (ret)
> + if (ret) {
> + free_netdev(netdev);
> return ret;
> + }
>
> /* Maybe there is a nice ethernet address we should use */
> gemini_port_save_mac_addr(port);
> @@ -2446,6 +2457,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
> port->reset = devm_reset_control_get_exclusive(dev, NULL);
> if (IS_ERR(port->reset)) {
> dev_err(dev, "no reset\n");
> + free_netdev(netdev);
> return PTR_ERR(port->reset);
> }
> reset_control_reset(port->reset);
> @@ -2501,8 +2513,10 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
> IRQF_SHARED,
> port_names[port->id],
> port);
> - if (ret)
> + if (ret) {
> + free_netdev(netdev);
> return ret;
> + }
>
> ret = register_netdev(netdev);
> if (!ret) {
> --
> 2.17.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> https://urldefense.proofpoint.com/v2/url?u=http-3A__lists.infradead.org_mailman_listinfo_linux-2Darm-2Dkernel&d=DwICAg&c=7dfBJ8cXbWjhc0BhImu8wQ&r=wlaKTGoVCDxOzHc2QUzpzGEf9oY3eidXlAe3OF1omvo&m=56ruRjtNY-BIzquRyoO0KSbrR7UBB81VfqotT_rfFus&s=Axiqv0SZYKFXgMc1zJLilZCk9wbRAt4LkKtW6VjKTgw&e=
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-29 10:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-29 3:46 [PATCH] net: ethernet: fix potential memory leak in gemini_ethernet_port_probe() Lu Wei
2020-07-29 3:46 ` Lu Wei
2020-07-29 10:02 ` Jisheng Zhang
2020-07-29 10:02 ` Jisheng Zhang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.