[PATCH v4 net RESEND] net/sonic: Fix some resource leaks in error handling paths

[Finn Thain]

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

A call to dma_alloc_coherent() is wrapped by sonic_alloc_descriptors().

This is correctly freed in the remove function, but not in the error
handling path of the probe function. Fix this by adding the missing
dma_free_coherent() call.

While at it, rename a label in order to be slightly more informative.

Cc: Christophe JAILLET <christophe.jail...@wanadoo.fr>
Cc: Thomas Bogendoerfer <tsbog...@alpha.franken.de>
Cc: Chris Zankel <ch...@zankel.net>
References: commit 10e3cc180e64 ("net/sonic: Fix a resource leak in an error 
handling path in 'jazz_sonic_probe()'")
Fixes: 74f2a5f0ef64 ("xtensa: Add support for the Sonic Ethernet device for the 
XT2000 board.")
Fixes: efcce839360f ("[PATCH] macsonic/jazzsonic network drivers update")
Signed-off-by: Christophe JAILLET <christophe.jail...@wanadoo.fr>
Signed-off-by: Finn Thain <fth...@telegraphics.com.au>
---
Changed since v3:
 - Update commit log.
Changed since v2:
 - Dropped whitespace change.
---
 drivers/net/ethernet/natsemi/macsonic.c | 12 ++++++++++--
 drivers/net/ethernet/natsemi/xtsonic.c  |  7 +++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/natsemi/macsonic.c 
b/drivers/net/ethernet/natsemi/macsonic.c
index 776b7d264dc3..2289e1fe3741 100644
--- a/drivers/net/ethernet/natsemi/macsonic.c
+++ b/drivers/net/ethernet/natsemi/macsonic.c
@@ -506,10 +506,14 @@ static int mac_sonic_platform_probe(struct 
platform_device *pdev)
 
        err = register_netdev(dev);
        if (err)
-               goto out;
+               goto undo_probe;
 
        return 0;
 
+undo_probe:
+       dma_free_coherent(lp->device,
+                         SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
+                         lp->descriptors, lp->descriptors_laddr);
 out:
        free_netdev(dev);
 
@@ -584,12 +588,16 @@ static int mac_sonic_nubus_probe(struct nubus_board 
*board)
 
        err = register_netdev(ndev);
        if (err)
-               goto out;
+               goto undo_probe;
 
        nubus_set_drvdata(board, ndev);
 
        return 0;
 
+undo_probe:
+       dma_free_coherent(lp->device,
+                         SIZEOF_SONIC_DESC * SONIC_BUS_SCALE(lp->dma_bitmode),
+                         lp->descriptors, lp->descriptors_laddr);
 out:
        free_netdev(ndev);
        return err;
diff --git a/drivers/net/ethernet/natsemi/xtsonic.c 
b/drivers/net/ethernet/natsemi/xtsonic.c
index afa166ff7aef..28d9e98db81a 100644
--- a/drivers/net/ethernet/natsemi/xtsonic.c
+++ b/drivers/net/ethernet/natsemi/xtsonic.c
@@ -229,11 +229,14 @@ int xtsonic_probe(struct platform_device *pdev)
        sonic_msg_init(dev);
 
        if ((err = register_netdev(dev)))
-               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_region(dev->base_addr, SONIC_MEM_SIZE);
 out:
        free_netdev(dev);
-- 
2.26.2