octeontx2-af: Fix a double free issue

sumang-mrvl · davem330 · commit 27c346a22f81 · 2023-12-22T13:31:54.000Z
There was a memory leak during error handling in function npc_mcam_rsrcs_init(). Fixes: dd78428 ("octeontx2-af: Add new devlink param to configure maximum usable NIX block LFs") Suggested-by: Simon Horman <horms@kernel.org> Signed-off-by: Suman Ghosh <sumang@marvell.com> Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
@@ -1990,7 +1990,7 @@ int npc_mcam_rsrcs_init(struct rvu *rvu, int blkaddr)
 free_bmap_reverse:
 	kfree(mcam->bmap_reverse);
 free_bmap:
-	kfree(mcam->counters.bmap);
+	kfree(mcam->bmap);
 
 	return -ENOMEM;
 }

Original file line number	Diff line number	Diff line change
`@@ -1990,7 +1990,7 @@ int npc_mcam_rsrcs_init(struct rvu *rvu, int blkaddr)`
`1990`	`1990`	`free_bmap_reverse:`
`1991`	`1991`	`kfree(mcam->bmap_reverse);`
`1992`	`1992`	`free_bmap:`
`1993`		`- kfree(mcam->counters.bmap);`
	`1993`	`+ kfree(mcam->bmap);`
`1994`	`1994`
`1995`	`1995`	`return -ENOMEM;`
`1996`	`1996`	`}`