Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59b12813 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

net/sonic: Fix some resource leaks in error handling paths 



[ Upstream commit 0f7ba7bc46fa0b574ccacf5672991b321e028492 ]

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.jaillet@wanadoo.fr>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Chris Zankel <chris@zankel.net>
References: commit 10e3cc180e64 ("net/sonic: Fix a resource leak in an error handling path in 'jazz_sonic_probe()'")
Fixes: 74f2a5f0 ("xtensa: Add support for the Sonic Ethernet device for the XT2000 board.")
Fixes: efcce839 ("[PATCH] macsonic/jazzsonic network drivers update")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78f33b3e

drivers/net/ethernet/natsemi/macsonic.c

+10 −2
Original line number Diff line number Diff line
@@ -540,10 +540,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);
@@ -618,12 +622,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;

drivers/net/ethernet/natsemi/xtsonic.c

+5 −2
Original line number Diff line number Diff line
@@ -265,11 +265,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);