summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWenwen Wang <wenwen@cs.uga.edu>2019-08-14 09:38:39 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-09-10 12:31:01 +0300
commitb57c8626385d319d4ce8d47feeba7d28fb3e5f02 (patch)
tree913570390011f4274bc3a2e0fdd7fcb19a684731
parent0b9e6253db9f607a167a53fe0006820c68b32aff (diff)
downloadlinux-b57c8626385d319d4ce8d47feeba7d28fb3e5f02.tar.xz
net: myri10ge: fix memory leaks
[ Upstream commit 20fb7c7a39b5c719e2e619673b5f5729ee7d2306 ] In myri10ge_probe(), myri10ge_alloc_slices() is invoked to allocate slices related structures. Later on, myri10ge_request_irq() is used to get an irq. However, if this process fails, the allocated slices related structures are not deallocated, leading to memory leaks. To fix this issue, revise the target label of the goto statement to 'abort_with_slices'. Signed-off-by: Wenwen Wang <wenwen@cs.uga.edu> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/ethernet/myricom/myri10ge/myri10ge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index 6d1a956e3f77..02ec326cb129 100644
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -4113,7 +4113,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
* setup (if available). */
status = myri10ge_request_irq(mgp);
if (status != 0)
- goto abort_with_firmware;
+ goto abort_with_slices;
myri10ge_free_irq(mgp);
/* Save configuration space to be restored if the