| Message ID | eaa8f403-7779-4d81-973d-a9ecddc0bf6f@stanley.mountain (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0aa3ca956c46d849775eae1816cef8fe4bc8b50e |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: mvpp2: Don't re-use loop iterator | expand |
On Wed, Jul 24, 2024 at 11:06:56AM -0500, Dan Carpenter wrote: > This function has a nested loop. The problem is that both the inside > and outside loop use the same variable as an iterator. I found this > via static analysis so I'm not sure the impact. It could be that it > loops forever or, more likely, the loop exits early. > > Fixes: 3a616b92a9d1 ("net: mvpp2: Add TX flow control support for jumbo frames") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: Simon Horman <horms@kernel.org>
On Wed, 24 Jul 2024 11:06:56 -0500 Dan Carpenter wrote: > This function has a nested loop. The problem is that both the inside > and outside loop use the same variable as an iterator. I found this > via static analysis so I'm not sure the impact. It could be that it > loops forever or, more likely, the loop exits early. > diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > index 8c45ad983abc..0d62a33afa80 100644 > --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > @@ -953,13 +953,13 @@ static void mvpp2_bm_pool_update_fc(struct mvpp2_port *port, > static void mvpp2_bm_pool_update_priv_fc(struct mvpp2 *priv, bool en) > { > struct mvpp2_port *port; > - int i; > + int i, j; > > for (i = 0; i < priv->port_count; i++) { > port = priv->port_list[i]; > if (port->priv->percpu_pools) { > - for (i = 0; i < port->nrxqs; i++) > - mvpp2_bm_pool_update_fc(port, &port->priv->bm_pools[i], > + for (j = 0; j < port->nrxqs; j++) > + mvpp2_bm_pool_update_fc(port, &port->priv->bm_pools[j], > port->tx_fc & en); > } else { > mvpp2_bm_pool_update_fc(port, port->pool_long, port->tx_fc & en); Stefan, can you comment? priv->bm_pools are global (not per port) AFAICT, so this may be semi-intentional.
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 24 Jul 2024 11:06:56 -0500 you wrote: > This function has a nested loop. The problem is that both the inside > and outside loop use the same variable as an iterator. I found this > via static analysis so I'm not sure the impact. It could be that it > loops forever or, more likely, the loop exits early. > > Fixes: 3a616b92a9d1 ("net: mvpp2: Add TX flow control support for jumbo frames") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > > [...] Here is the summary with links: - [net] net: mvpp2: Don't re-use loop iterator https://git.kernel.org/netdev/net/c/0aa3ca956c46 You are awesome, thank you!
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 8c45ad983abc..0d62a33afa80 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -953,13 +953,13 @@ static void mvpp2_bm_pool_update_fc(struct mvpp2_port *port, static void mvpp2_bm_pool_update_priv_fc(struct mvpp2 *priv, bool en) { struct mvpp2_port *port; - int i; + int i, j; for (i = 0; i < priv->port_count; i++) { port = priv->port_list[i]; if (port->priv->percpu_pools) { - for (i = 0; i < port->nrxqs; i++) - mvpp2_bm_pool_update_fc(port, &port->priv->bm_pools[i], + for (j = 0; j < port->nrxqs; j++) + mvpp2_bm_pool_update_fc(port, &port->priv->bm_pools[j], port->tx_fc & en); } else { mvpp2_bm_pool_update_fc(port, port->pool_long, port->tx_fc & en);
This function has a nested loop. The problem is that both the inside and outside loop use the same variable as an iterator. I found this via static analysis so I'm not sure the impact. It could be that it loops forever or, more likely, the loop exits early. Fixes: 3a616b92a9d1 ("net: mvpp2: Add TX flow control support for jumbo frames") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)