* [PATCH] net/sonic: Fix a resource leak in an error handling path in 'jazz_sonic_probe()'
@ 2020-04-27 6:18 Christophe JAILLET
2020-04-27 19:08 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Christophe JAILLET @ 2020-04-27 6:18 UTC (permalink / raw)
To: davem, fthain, tsbogend, jgarzik
Cc: netdev, linux-kernel, kernel-janitors, Christophe JAILLET
A call to 'dma_alloc_coherent()' is hidden in 'sonic_alloc_descriptors()',
called from 'sonic_probe1()'.
This is correctly freed in the remove function, but not in the error
handling path of the probe function.
Fix it and add the missing 'dma_free_coherent()' call.
While at it, rename a label in order to be slightly more informative.
Fixes: efcce839360f ("[PATCH] macsonic/jazzsonic network drivers update")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
drivers/net/ethernet/natsemi/jazzsonic.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/natsemi/jazzsonic.c b/drivers/net/ethernet/natsemi/jazzsonic.c
index bfa0c0d39600..8b018ed37b1b 100644
--- a/drivers/net/ethernet/natsemi/jazzsonic.c
+++ b/drivers/net/ethernet/natsemi/jazzsonic.c
@@ -208,11 +208,13 @@ static int jazz_sonic_probe(struct platform_device *pdev)
err = register_netdev(dev);
if (err)
- goto out1;
+ goto undo_probe1;
return 0;
-out1:
+undo_probe1:
+ dma_free_coherent(lp->device, SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
+ lp->descriptors, lp->descriptors_laddr);
release_mem_region(dev->base_addr, SONIC_MEM_SIZE);
out:
free_netdev(dev);
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net/sonic: Fix a resource leak in an error handling path in 'jazz_sonic_probe()'
2020-04-27 6:18 [PATCH] net/sonic: Fix a resource leak in an error handling path in 'jazz_sonic_probe()' Christophe JAILLET
@ 2020-04-27 19:08 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-04-27 19:08 UTC (permalink / raw)
To: christophe.jaillet
Cc: fthain, tsbogend, jgarzik, netdev, linux-kernel, kernel-janitors
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Date: Mon, 27 Apr 2020 08:18:03 +0200
> A call to 'dma_alloc_coherent()' is hidden in 'sonic_alloc_descriptors()',
> called from 'sonic_probe1()'.
>
> This is correctly freed in the remove function, but not in the error
> handling path of the probe function.
> Fix it and add the missing 'dma_free_coherent()' call.
>
> While at it, rename a label in order to be slightly more informative.
>
> Fixes: efcce839360f ("[PATCH] macsonic/jazzsonic network drivers update")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-27 19:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-27 6:18 [PATCH] net/sonic: Fix a resource leak in an error handling path in 'jazz_sonic_probe()' Christophe JAILLET
2020-04-27 19:08 ` 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).