Skip to content

Commit

Permalink
net/sonic: Fix a resource leak in an error handling path in 'jazz_son…
Browse files Browse the repository at this point in the history
…ic_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: efcce83 ("[PATCH] macsonic/jazzsonic network drivers update")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Christophe JAILLET authored and David S. Miller committed Apr 27, 2020
1 parent 4b5b71f commit 10e3cc1
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/net/ethernet/natsemi/jazzsonic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 10e3cc1

Please sign in to comment.