From: Arkadi Sharshevsky Date: Thu, 18 May 2017 07:18:53 +0000 (+0200) Subject: mlxsw: spectrum_router: Fix rif counter freeing routine X-Git-Tag: MMI-PSA29.97-13-9~5573^2~3^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6b1206bbbce6092b2ec412125300889e6e551bc2;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git mlxsw: spectrum_router: Fix rif counter freeing routine During rif counter freeing the counter index can be invalid. Add check of validity before freeing the counter. Fixes: e0c0afd8aa4e ("mlxsw: spectrum: Support for counters on router interfaces") Signed-off-by: Arkadi Sharshevsky Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index 33cec1cc1642..9f89c4137d21 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -206,6 +206,9 @@ void mlxsw_sp_rif_counter_free(struct mlxsw_sp *mlxsw_sp, { unsigned int *p_counter_index; + if (!mlxsw_sp_rif_counter_valid_get(rif, dir)) + return; + p_counter_index = mlxsw_sp_rif_p_counter_get(rif, dir); if (WARN_ON(!p_counter_index)) return;