From 998ed7803a82be29fbe7ea7640c407bc864323ac Mon Sep 17 00:00:00 2001

From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Date: Mon, 27 Apr 2020 08:18:03 +0200

Subject: [PATCH 5/8] net/sonic: Fix a resource leak in an error handling path

 in 'jazz_sonic_probe()'

Git-commit: 10e3cc180e64385edc9890c6855acf5ed9ca1339

Patch-mainline: v5.7-rc5

References: git-fixes

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>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>

---

 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 a6caeb567c0d..2bf2b0314ca9 100644

--- a/drivers/net/ethernet/natsemi/jazzsonic.c

+++ b/drivers/net/ethernet/natsemi/jazzsonic.c

@@ -246,13 +246,15 @@ static int jazz_sonic_probe(struct platform_device *pdev)

 		goto out;

 	err = register_netdev(dev);

 	if (err)

-		goto out1;

+		goto undo_probe1;

 	printk("%s: MAC %pM IRQ %d\n", dev->name, dev->dev_addr, dev->irq);

 	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.16.4