octeontx2-af: Fix potential integer overflows on integer shifts

[ Upstream commit 637c4f6fe40befa04f19c38b5d15429cbb9191d9 ]

The left shift int 32 bit integer constants 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>
Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://patch.msgid.link/20241010154519.768785-1-colin.i.king@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
index f2e1c63035e8566fd9e76207d94bf729c131e942..8bdde74b34b6d2c2aac3b95372b9d46b1aaca551 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
@@ -2239,7 +2239,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);
@@ -2260,7 +2260,7 @@ static int nix_smq_flush(struct rvu *rvu, int blkaddr,
 
        /* Set NIX_AF_TL3_TL2_LINKX_CFG[ENA] for the TL3/TL2 queue */
        for (i = 0; i < (rvu->hw->cgx_links + rvu->hw->lbk_links); i++) {
-               if (!(bmap & (1 << i)))
+               if (!(bmap & BIT_ULL(i)))
                        continue;
                cfg = rvu_read64(rvu, blkaddr,
                                 NIX_AF_TL3_TL2X_LINKX_CFG(tl2_tl3_link_schq, link));