| Message ID | 20241010131122.751744-1-colin.i.king@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [next] octeontx2-af: Fix potential integer overflow on shift of a int | expand |
On Thu, Oct 10, 2024 at 02:11:22PM +0100, Colin Ian King wrote: > The left shift of int 32 bit integer constant 1 is evaluated using 32 bit > arithmetic and then assigned to a 64 bit unsigned integer. In the case > where the shift is 32 or more this can lead to an overflow. Avoid this > by shifting using the BIT_ULL macro instead. > > Fixes: 019aba04f08c ("octeontx2-af: Modify SMQ flush sequence to drop packets") > Signed-off-by: Colin Ian King <colin.i.king@gmail.com> > --- > drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c > index 82832a24fbd8..28f917a37acf 100644 > --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c > +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c > @@ -2411,7 +2411,7 @@ static int nix_smq_flush(struct rvu *rvu, int blkaddr, > NIX_AF_TL3_TL2X_LINKX_CFG(tl2_tl3_link_schq, link)); > if (!(cfg & BIT_ULL(12))) > continue; > - bmap |= (1 << i); > + bmap |= BIT_ULL(i); There is a similar issue in the next loop. Could you fix that as well? regards, dan carpenter
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c index 82832a24fbd8..28f917a37acf 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c @@ -2411,7 +2411,7 @@ static int nix_smq_flush(struct rvu *rvu, int blkaddr, NIX_AF_TL3_TL2X_LINKX_CFG(tl2_tl3_link_schq, link)); if (!(cfg & BIT_ULL(12))) continue; - bmap |= (1 << i); + bmap |= BIT_ULL(i); cfg &= ~BIT_ULL(12); rvu_write64(rvu, blkaddr, NIX_AF_TL3_TL2X_LINKX_CFG(tl2_tl3_link_schq, link), cfg);
The left shift of int 32 bit integer constant 1 is evaluated using 32 bit arithmetic and then assigned to a 64 bit unsigned integer. In the case where the shift is 32 or more this can lead to an overflow. Avoid this by shifting using the BIT_ULL macro instead. Fixes: 019aba04f08c ("octeontx2-af: Modify SMQ flush sequence to drop packets") Signed-off-by: Colin Ian King <colin.i.king@gmail.com> --- drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)