Skip to content

Commit 9312ee7

Browse files
hormskuba-moo
authored andcommitted
octeontx2-af: use unsigned int as iterator for unsigned values
The local variable i is used to iterate over unsigned values. The lower bound of the loop is set to 0. While the upper bound is cgx->lmac_count, where they lmac_count is an u8. So the theoretical upper bound is 255. As is, GCC can't see this range of values and warns that a formatted string, which includes the %d representation of i, may overflow the buffer provided. GCC 15.1.0 says: .../cgx.c: In function 'cgx_lmac_init': .../cgx.c:1737:49: warning: '%d' directive writing between 1 and 11 bytes into a region of size between 4 and 6 [-Wformat-overflow=] 1737 | sprintf(lmac->name, "cgx_fwi_%d_%d", cgx->cgx_id, i); | ^~ .../cgx.c:1737:37: note: directive argument in the range [-2147483641, 254] 1737 | sprintf(lmac->name, "cgx_fwi_%d_%d", cgx->cgx_id, i); | ^~~~~~~~~~~~~~~ .../cgx.c:1737:17: note: 'sprintf' output between 12 and 24 bytes into a destination of size 16 1737 | sprintf(lmac->name, "cgx_fwi_%d_%d", cgx->cgx_id, i); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Empirically, changing the type of i from (signed) int to unsigned int addresses this problem. I assume by allowing GCC to see the range of values described above. Also update the format specifiers for the integer values in the string in question from %d to %u. This seems appropriate as they are now both unsigned. No functional change intended. Compile tested only. Signed-off-by: Simon Horman <horms@kernel.org> Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev> Link: https://patch.msgid.link/20250724-octeontx2-af-unsigned-v1-1-c745c106e06f@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent fada264 commit 9312ee7

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

  • drivers/net/ethernet/marvell/octeontx2/af

drivers/net/ethernet/marvell/octeontx2/af/cgx.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1706,9 +1706,9 @@ static int cgx_lmac_init(struct cgx *cgx)
17061706
{
17071707
u8 max_dmac_filters;
17081708
struct lmac *lmac;
1709+
int err, filter;
1710+
unsigned int i;
17091711
u64 lmac_list;
1710-
int i, err;
1711-
int filter;
17121712

17131713
/* lmac_list specifies which lmacs are enabled
17141714
* when bit n is set to 1, LMAC[n] is enabled
@@ -1734,7 +1734,7 @@ static int cgx_lmac_init(struct cgx *cgx)
17341734
err = -ENOMEM;
17351735
goto err_lmac_free;
17361736
}
1737-
sprintf(lmac->name, "cgx_fwi_%d_%d", cgx->cgx_id, i);
1737+
sprintf(lmac->name, "cgx_fwi_%u_%u", cgx->cgx_id, i);
17381738
if (cgx->mac_ops->non_contiguous_serdes_lane) {
17391739
lmac->lmac_id = __ffs64(lmac_list);
17401740
lmac_list &= ~BIT_ULL(lmac->lmac_id);

0 commit comments

Comments
 (0)