Commit d68c2e1d authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

net: stmmac: fix off-by-one error in sanity check 



My previous patch had an off-by-one error in the added sanity
check, the arrays are MTL_MAX_{RX,TX}_QUEUES long, so if that
index is that number, it has overflown.

The patch silenced the warning anyway because the strings could
no longer overlap with the input, but they could still overlap
with other fields.

Fixes: 3e0d5699 ("net: stmmac: fix gcc-10 -Wrestrict warning")
Reported-by: default avatarRussell King (Oracle) <linux@armlinux.org.uk>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 861f40fa

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+2 −2
Original line number Diff line number Diff line
@@ -3502,7 +3502,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 


	/* Request Rx MSI irq */

	for (i = 0; i < priv->plat->rx_queues_to_use; i++) {

		if (i > MTL_MAX_RX_QUEUES)

		if (i >= MTL_MAX_RX_QUEUES)

			break;

		if (priv->rx_irq[i] == 0)

			continue;
@@ -3527,7 +3527,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) 


	/* Request Tx MSI irq */

	for (i = 0; i < priv->plat->tx_queues_to_use; i++) {

		if (i > MTL_MAX_TX_QUEUES)

		if (i >= MTL_MAX_TX_QUEUES)

			break;

		if (priv->tx_irq[i] == 0)

			continue;