Commit bf3c068c authored Apr 27, 2020 by Christophe JAILLET Committed by Greg Kroah-Hartman May 20, 2020

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



[ Upstream commit 10e3cc180e64385edc9890c6855acf5ed9ca1339 ]

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: efcce839 ("[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: Sasha Levin <sashal@kernel.org>

parent fccb7bbc

drivers/net/ethernet/natsemi/jazzsonic.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -247,13 +247,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);