Skip to content

Commit 0087168

Browse files
Abdun NihaalNipaLocal
authored andcommitted
nfp: xsk: fix memory leak in nfp_net_alloc()
In nfp_net_alloc(), the memory allocated for xsk_pools is not freed in the subsequent error paths, leading to a memory leak. Fix that by freeing it in the error path. Fixes: 6402528 ("nfp: xsk: add AF_XDP zero-copy Rx and Tx support") Signed-off-by: Abdun Nihaal <nihaal@cse.iitm.ac.in> Signed-off-by: NipaLocal <nipa@local>
1 parent 3d4aa89 commit 0087168

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2557,14 +2557,16 @@ nfp_net_alloc(struct pci_dev *pdev, const struct nfp_dev_info *dev_info,
25572557
err = nfp_net_tlv_caps_parse(&nn->pdev->dev, nn->dp.ctrl_bar,
25582558
&nn->tlv_caps);
25592559
if (err)
2560-
goto err_free_nn;
2560+
goto err_free_xsk_pools;
25612561

25622562
err = nfp_ccm_mbox_alloc(nn);
25632563
if (err)
2564-
goto err_free_nn;
2564+
goto err_free_xsk_pools;
25652565

25662566
return nn;
25672567

2568+
err_free_xsk_pools:
2569+
kfree(nn->dp.xsk_pools);
25682570
err_free_nn:
25692571
if (nn->dp.netdev)
25702572
free_netdev(nn->dp.netdev);

0 commit comments

Comments
 (0)