net/mlx5e: Fix access to non-existing receive queue

Tariq Toukan · Saeed Mahameed · commit c475e11e82d1 · 2019-03-11T11:32:40.000-07:00
In case number of channels is changed while interface is down, RSS indirection table is mistakenly not modified accordingly, causing access to out-of-range non-existing object. Fix by updating the RSS indireciton table also in the early return flow of interface down. Fixes: fb35c53 ("net/mlx5e: Fix NULL pointer derefernce in set channels error flow") Fixes: bbeb53b ("net/mlx5e: Move RSS params to a dedicated struct") Reported-by: Or Gerlitz <ogerlitz@mellanox.com> Tested-by: Maria Pasechnik <mariap@mellanox.com> Signed-off-by: Tariq Toukan <tariqt@mellanox.com> Reviewed-by: Eran Ben Elisha <eranbe@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -424,6 +424,9 @@ int mlx5e_ethtool_set_channels(struct mlx5e_priv *priv,
 
 	if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) {
 		priv->channels.params = new_channels.params;
+		if (!netif_is_rxfh_configured(priv->netdev))
+			mlx5e_build_default_indir_rqt(priv->rss_params.indirection_rqt,
+						      MLX5E_INDIR_RQT_SIZE, count);
 		goto out;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -424,6 +424,9 @@ int mlx5e_ethtool_set_channels(struct mlx5e_priv *priv,`
`424`	`424`
`425`	`425`	`if (!test_bit(MLX5E_STATE_OPENED, &priv->state)) {`
`426`	`426`	`priv->channels.params = new_channels.params;`
	`427`	`+ if (!netif_is_rxfh_configured(priv->netdev))`
	`428`	`+ mlx5e_build_default_indir_rqt(priv->rss_params.indirection_rqt,`
	`429`	`+ MLX5E_INDIR_RQT_SIZE, count);`
`427`	`430`	`goto out;`
`428`	`431`	`}`
`429`	`432`