* Re: [PATCH] net: nixge: fix potential memory leak in nixge_probe()
@ 2020-07-29 7:49 Markus Elfring
0 siblings, 0 replies; 3+ messages in thread
From: Markus Elfring @ 2020-07-29 7:49 UTC (permalink / raw)
To: Lu Wei, netdev
Cc: linux-kernel, kernel-janitors, Alex Williams, Andrew Lunn,
Dan Carpenter, David S. Miller, Jakub Kicinski, Moritz Fischer,
Yunjian Wang
> If some processes in nixge_probe() fail, free_netdev(dev)
> needs to be called to aviod a memory leak.
* Would you like to avoid a typo in this change description?
* An imperative wording can be preferred here, can't it?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?id=6ba1b005ffc388c2aeaddae20da29e4810dea298#n151
Regards,
Markus
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net: nixge: fix potential memory leak in nixge_probe()
2020-07-29 3:50 Lu Wei
@ 2020-07-30 23:55 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2020-07-30 23:55 UTC (permalink / raw)
To: luwei32
Cc: kuba, wangyunjian, dan.carpenter, andrew, alex.williams, mdf,
netdev, linux-kernel
From: Lu Wei <luwei32@huawei.com>
Date: Wed, 29 Jul 2020 11:50:05 +0800
> If some processes in nixge_probe() fail, free_netdev(dev)
> needs to be called to aviod a memory leak.
>
> Fixes: 87ab207981ec ("net: nixge: Separate ctrl and dma resources")
> Fixes: abcd3d6fc640 ("net: nixge: Fix error path for obtaining mac address")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Lu Wei <luwei32@huawei.com>
Applied, thank you.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] net: nixge: fix potential memory leak in nixge_probe()
@ 2020-07-29 3:50 Lu Wei
2020-07-30 23:55 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Lu Wei @ 2020-07-29 3:50 UTC (permalink / raw)
To: davem, kuba, wangyunjian, dan.carpenter, andrew, alex.williams,
mdf, netdev, linux-kernel
If some processes in nixge_probe() fail, free_netdev(dev)
needs to be called to aviod a memory leak.
Fixes: 87ab207981ec ("net: nixge: Separate ctrl and dma resources")
Fixes: abcd3d6fc640 ("net: nixge: Fix error path for obtaining mac address")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Lu Wei <luwei32@huawei.com>
---
drivers/net/ethernet/ni/nixge.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c
index d2708a57f2ff..4075f5e59955 100644
--- a/drivers/net/ethernet/ni/nixge.c
+++ b/drivers/net/ethernet/ni/nixge.c
@@ -1299,19 +1299,21 @@ static int nixge_probe(struct platform_device *pdev)
netif_napi_add(ndev, &priv->napi, nixge_poll, NAPI_POLL_WEIGHT);
err = nixge_of_get_resources(pdev);
if (err)
- return err;
+ goto free_netdev;
__nixge_hw_set_mac_address(ndev);
priv->tx_irq = platform_get_irq_byname(pdev, "tx");
if (priv->tx_irq < 0) {
netdev_err(ndev, "could not find 'tx' irq");
- return priv->tx_irq;
+ err = priv->tx_irq;
+ goto free_netdev;
}
priv->rx_irq = platform_get_irq_byname(pdev, "rx");
if (priv->rx_irq < 0) {
netdev_err(ndev, "could not find 'rx' irq");
- return priv->rx_irq;
+ err = priv->rx_irq;
+ goto free_netdev;
}
priv->coalesce_count_rx = XAXIDMA_DFT_RX_THRESHOLD;
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-30 23:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-29 7:49 [PATCH] net: nixge: fix potential memory leak in nixge_probe() Markus Elfring
-- strict thread matches above, loose matches on Subject: below --
2020-07-29 3:50 Lu Wei
2020-07-30 23:55 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).