Skip to content

Commit 563307e

Browse files
committed
Merge branch 'mana-fix-few-memory-leaks-in-mana_gd_setup_irqs'
Maxim Levitsky says: ==================== MANA: Fix few memory leaks in mana_gd_setup_irqs Fix 2 minor memory leaks in the mana driver, introduced by commit ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 15bfb14 + 9a5beb6 commit 563307e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/net/ethernet/microsoft/mana/gdma_main.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev)
13181318
GFP_KERNEL);
13191319
if (!gc->irq_contexts) {
13201320
err = -ENOMEM;
1321-
goto free_irq_vector;
1321+
goto free_irq_array;
13221322
}
13231323

13241324
for (i = 0; i < nvec; i++) {
@@ -1375,6 +1375,7 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev)
13751375
gc->max_num_msix = nvec;
13761376
gc->num_msix_usable = nvec;
13771377
cpus_read_unlock();
1378+
kfree(irqs);
13781379
return 0;
13791380

13801381
free_irq:
@@ -1387,8 +1388,9 @@ static int mana_gd_setup_irqs(struct pci_dev *pdev)
13871388
}
13881389

13891390
kfree(gc->irq_contexts);
1390-
kfree(irqs);
13911391
gc->irq_contexts = NULL;
1392+
free_irq_array:
1393+
kfree(irqs);
13921394
free_irq_vector:
13931395
cpus_read_unlock();
13941396
pci_free_irq_vectors(pdev);

0 commit comments

Comments
 (0)