| Message ID | 20201110023222.1479398-1-andrew@lunn.ch |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [net-next,v2] drivers: net: sky2: Fix -Wstringop-truncation with W=1 | expand |
On Tue, 10 Nov 2020 03:32:22 +0100 Andrew Lunn <andrew@lunn.ch> wrote: > In function ‘strncpy’, > inlined from ‘sky2_name’ at drivers/net/ethernet/marvell/sky2.c:4903:3, > inlined from ‘sky2_probe’ at drivers/net/ethernet/marvell/sky2.c:5049:2: > ./include/linux/string.h:297:30: warning: ‘__builtin_strncpy’ specified bound 16 equals destination size [-Wstringop-truncation] > > None of the device names are 16 characters long, so it was never an > issue. But replace the strncpy with an snprintf() to prevent the > theoretical overflow. > > Suggested-by: Stephen Hemminger <stephen@networkplumber.org> > Signed-off-by: Andrew Lunn <andrew@lunn.ch> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
On Tue, 10 Nov 2020 03:32:22 +0100 Andrew Lunn wrote: > In function ‘strncpy’, > inlined from ‘sky2_name’ at drivers/net/ethernet/marvell/sky2.c:4903:3, > inlined from ‘sky2_probe’ at drivers/net/ethernet/marvell/sky2.c:5049:2: > ./include/linux/string.h:297:30: warning: ‘__builtin_strncpy’ specified bound 16 equals destination size [-Wstringop-truncation] > > None of the device names are 16 characters long, so it was never an > issue. But replace the strncpy with an snprintf() to prevent the > theoretical overflow. > > Suggested-by: Stephen Hemminger <stephen@networkplumber.org> > Signed-off-by: Andrew Lunn <andrew@lunn.ch> Applied, thanks!
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 25981a7a43b5..ebe1406c6e64 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -4900,7 +4900,7 @@ static const char *sky2_name(u8 chipid, char *buf, int sz) }; if (chipid >= CHIP_ID_YUKON_XL && chipid <= CHIP_ID_YUKON_OP_2) - strncpy(buf, name[chipid - CHIP_ID_YUKON_XL], sz); + snprintf(buf, sz, "%s", name[chipid - CHIP_ID_YUKON_XL]); else snprintf(buf, sz, "(chip %#x)", chipid); return buf;
In function ‘strncpy’, inlined from ‘sky2_name’ at drivers/net/ethernet/marvell/sky2.c:4903:3, inlined from ‘sky2_probe’ at drivers/net/ethernet/marvell/sky2.c:5049:2: ./include/linux/string.h:297:30: warning: ‘__builtin_strncpy’ specified bound 16 equals destination size [-Wstringop-truncation] None of the device names are 16 characters long, so it was never an issue. But replace the strncpy with an snprintf() to prevent the theoretical overflow. Suggested-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: Andrew Lunn <andrew@lunn.ch> --- drivers/net/ethernet/marvell/sky2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)