net/mlx5: fix endless loop when clearing flow flags
authorYongseok Koh <yskoh@mellanox.com>
Mon, 23 Jul 2018 18:27:44 +0000 (11:27 -0700)
committerThomas Monjalon <thomas@monjalon.net>
Thu, 26 Jul 2018 12:05:52 +0000 (14:05 +0200)
If one of (*priv->rxqs)[] is null, the for loop can iterate infinitely as
idx can't be increased.

Fixes: cd24d526395e ("net/mlx5: add mark/flag flow action")

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Ori Kam <orika@mellanox.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
drivers/net/mlx5/mlx5_flow.c

index 3285419..c156f01 100644 (file)
@@ -2762,22 +2762,20 @@ mlx5_flow_rxq_flags_clear(struct rte_eth_dev *dev)
 {
        struct priv *priv = dev->data->dev_private;
        unsigned int i;
-       unsigned int idx;
 
-       for (idx = 0, i = 0; idx != priv->rxqs_n; ++i) {
+       for (i = 0; i != priv->rxqs_n; ++i) {
                struct mlx5_rxq_ctrl *rxq_ctrl;
                unsigned int j;
 
-               if (!(*priv->rxqs)[idx])
+               if (!(*priv->rxqs)[i])
                        continue;
-               rxq_ctrl = container_of((*priv->rxqs)[idx],
+               rxq_ctrl = container_of((*priv->rxqs)[i],
                                        struct mlx5_rxq_ctrl, rxq);
                rxq_ctrl->flow_mark_n = 0;
                rxq_ctrl->rxq.mark = 0;
                for (j = 0; j != MLX5_FLOW_TUNNEL; ++j)
                        rxq_ctrl->flow_tunnels_n[j] = 0;
                rxq_ctrl->rxq.tunnel = 0;
-               ++idx;
        }
 }