]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commit
net/sonic: Fix some resource leaks in error handling paths
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sun, 3 Jan 2021 00:26:26 +0000 (11:26 +1100)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 19 Feb 2021 15:44:11 +0000 (16:44 +0100)
commita0a9b4f71f53040138a22a1948a10a7d16a903d7
treec074e45db75fa813319b1965fbca47553c165c37
parent9c8d86d2f3e113fbd61b6d6744ef0723e055a32c
net/sonic: Fix some resource leaks in error handling paths

BugLink: https://bugs.launchpad.net/bugs/1913487
[ 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: 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.jaillet@wanadoo.fr>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: William Breathitt Gray <william.gray@canonical.com>
drivers/net/ethernet/natsemi/macsonic.c
drivers/net/ethernet/natsemi/xtsonic.c