| Message ID | 20240328165505.19106-1-amishin@t-argos.ru (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ef15ddeeb6bee87c044bf7754fac524545bf71e8 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2] octeontx2-af: Add array index check | expand |
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Thu, 28 Mar 2024 19:55:05 +0300 you wrote: > In rvu_map_cgx_lmac_pf() the 'iter', which is used as an array index, can reach > value (up to 14) that exceed the size (MAX_LMAC_COUNT = 8) of the array. > Fix this bug by adding 'iter' value check. > > Found by Linux Verification Center (linuxtesting.org) with SVACE. > > Fixes: 91c6945ea1f9 ("octeontx2-af: cn10k: Add RPM MAC support") > Signed-off-by: Aleksandr Mishin <amishin@t-argos.ru> > > [...] Here is the summary with links: - [net,v2] octeontx2-af: Add array index check https://git.kernel.org/netdev/net/c/ef15ddeeb6be You are awesome, thank you!
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c index 72e060cf6b61..e9bf9231b018 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c @@ -160,6 +160,8 @@ static int rvu_map_cgx_lmac_pf(struct rvu *rvu) continue; lmac_bmap = cgx_get_lmac_bmap(rvu_cgx_pdata(cgx, rvu)); for_each_set_bit(iter, &lmac_bmap, rvu->hw->lmac_per_cgx) { + if (iter >= MAX_LMAC_COUNT) + continue; lmac = cgx_get_lmacid(rvu_cgx_pdata(cgx, rvu), iter); rvu->pf2cgxlmac_map[pf] = cgxlmac_id_to_bmap(cgx, lmac);
In rvu_map_cgx_lmac_pf() the 'iter', which is used as an array index, can reach value (up to 14) that exceed the size (MAX_LMAC_COUNT = 8) of the array. Fix this bug by adding 'iter' value check. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 91c6945ea1f9 ("octeontx2-af: cn10k: Add RPM MAC support") Signed-off-by: Aleksandr Mishin <amishin@t-argos.ru> --- v2: Fix subject according to the networking rules drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 2 ++ 1 file changed, 2 insertions(+)