From dbcdb61aaf1add3fb15f24f7fcbf30c17d5c11db Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 2 Jul 2019 19:06:47 +0000 Subject: [PATCH] mlxsw: spectrum_ptp: Fix validation in mlxsw_sp1_ptp_packet_finish() Before mlxsw_sp1_ptp_packet_finish() sends the packet back, it validates whether the corresponding port is still valid. However the condition is incorrect: when mlxsw_sp_port == NULL, the code dereferences the port to compare it to skb->dev. The condition needs to check whether the port is present and skb->dev still refers to that port (or else is NULL). If that does not hold, bail out. Add a pair of parentheses to fix the condition. Fixes: d92e4e6e33c8 ("mlxsw: spectrum: PTP: Support timestamping on Spectrum-1") Reported-by: Colin Ian King Signed-off-by: Petr Machata Signed-off-by: Colin Ian King Reviewed-by: Ido Schimmel Signed-off-by: David S. Miller --- drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c index 7d42f86237cd..437023d67a3b 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c @@ -425,7 +425,7 @@ static void mlxsw_sp1_ptp_packet_finish(struct mlxsw_sp *mlxsw_sp, * split). Also make sure the SKB device reference is still valid. */ mlxsw_sp_port = mlxsw_sp->ports[local_port]; - if (!mlxsw_sp_port && (!skb->dev || skb->dev == mlxsw_sp_port->dev)) { + if (!(mlxsw_sp_port && (!skb->dev || skb->dev == mlxsw_sp_port->dev))) { dev_kfree_skb_any(skb); return; } -- 2.30.2