On Tue, Mar 11, 2025 at 08:27:45AM +0100, Michal Swiatkowski wrote:
> On Mon, Mar 10, 2025 at 03:24:16PM -0700, Kees Cook wrote:
> > GCC 15's -Wunterminated-string-initialization saw that this string was
> > being truncated. Adjust the initializer so that the needed final NUL
> > character will be present.
> >
> > Cc: Nicolas Ferre <nicolas.fe...@microchip.com>
> > Cc: Claudiu Beznea <claudiu.bez...@tuxon.dev>
> > Cc: Andrew Lunn <andrew+net...@lunn.ch>
> > Cc: "David S. Miller" <da...@davemloft.net>
> > Cc: Eric Dumazet <eduma...@google.com>
> > Cc: Jakub Kicinski <k...@kernel.org>
> > Cc: Paolo Abeni <pab...@redhat.com>
> > Cc: net...@vger.kernel.org
> > Signed-off-by: Kees Cook <k...@kernel.org>
> > ---
> > drivers/net/ethernet/cadence/macb.h | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ethernet/cadence/macb.h
> > b/drivers/net/ethernet/cadence/macb.h
> > index 2847278d9cd4..9a6acb97c82d 100644
> > --- a/drivers/net/ethernet/cadence/macb.h
> > +++ b/drivers/net/ethernet/cadence/macb.h
> > @@ -1067,7 +1067,8 @@ static const struct gem_statistic gem_statistics[] = {
> > GEM_STAT_TITLE(TX256CNT, "tx_256_511_byte_frames"),
> > GEM_STAT_TITLE(TX512CNT, "tx_512_1023_byte_frames"),
> > GEM_STAT_TITLE(TX1024CNT, "tx_1024_1518_byte_frames"),
> > - GEM_STAT_TITLE(TX1519CNT, "tx_greater_than_1518_byte_frames"),
> > + GEM_STAT_TITLE(TX1519CNT, "tx_greater_than_1518_byte_frame"),
> > +
> > GEM_STAT_TITLE_BITS(TXURUNCNT, "tx_underrun",
> > GEM_BIT(NDS_TXERR)|GEM_BIT(NDS_TXFIFOERR)),
> > GEM_STAT_TITLE_BITS(SNGLCOLLCNT, "tx_single_collision_frames",
>
> "rx_greater_than_1518_byte_frames" is also 32, probably you should fix
> that too.
Ah! So it is, thank you. I must have missed it while grinding through
all the warnings I was working on. I will adjust this!
--
Kees Cook
