2020-04-27 06:20:42

by Christophe JAILLET

Subject: [PATCH] net/sonic: Fix a resource leak in an error handling path in 'jazz_sonic_probe()'

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 <[email protected]>
---
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

2020-04-27 19:09:58

by David Miller

Subject: Re: [PATCH] net/sonic: Fix a resource leak in an error handling path in 'jazz_sonic_probe()'

From: Christophe JAILLET <[email protected]>
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 <[email protected]>

Applied, thanks.