leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

octeontx2-af: Fix some memory leaks in the error handling path of 'cgx_lmac_init()'

Browse Source 
Memory allocated before 'lmac' is stored in 'cgx->lmac_idmap[]' must be
freed explicitly. Otherwise, in case of error, it will leak.

Rename the 'err_irq' label to better describe what is done at this place in
the error handling path.

Fixes: 6f14078e3e ("octeontx2-af: DMAC filter support in MAC block")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christophe JAILLET
2021-09-04 09:34:51 +02:00
committed by David S. Miller
parent d863ca67bb
commit ecbd690b52
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/marvell/octeontx2/af/cgx.c
View File

@@ -1487,7 +1487,7 @@ static int cgx_lmac_init(struct cgx *cgx)
MAX_DMAC_ENTRIES_PER_CGX / cgx->lmac_count; MAX_DMAC_ENTRIES_PER_CGX / cgx->lmac_count;
err = rvu_alloc_bitmap(&lmac->mac_to_index_bmap); err = rvu_alloc_bitmap(&lmac->mac_to_index_bmap);
if (err) if (err)
return err; goto err_name_free;
/* Reserve first entry for default MAC address */ /* Reserve first entry for default MAC address */
set_bit(0, lmac->mac_to_index_bmap.bmap); set_bit(0, lmac->mac_to_index_bmap.bmap);
@@ -1497,7 +1497,7 @@ static int cgx_lmac_init(struct cgx *cgx)
spin_lock_init(&lmac->event_cb_lock); spin_lock_init(&lmac->event_cb_lock);
err = cgx_configure_interrupt(cgx, lmac, lmac->lmac_id, false); err = cgx_configure_interrupt(cgx, lmac, lmac->lmac_id, false);
if (err) if (err)
goto err_irq; goto err_bitmap_free;
/* Add reference */ /* Add reference */
cgx->lmac_idmap[lmac->lmac_id] = lmac; cgx->lmac_idmap[lmac->lmac_id] = lmac;
@@ -1507,7 +1507,9 @@ static int cgx_lmac_init(struct cgx *cgx)
return cgx_lmac_verify_fwi_version(cgx); return cgx_lmac_verify_fwi_version(cgx);
err_irq: err_bitmap_free:
rvu_free_bitmap(&lmac->mac_to_index_bmap);
err_name_free:
kfree(lmac->name); kfree(lmac->name);
err_lmac_free: err_lmac_free:
kfree(lmac); kfree(lmac);