diff options
| author |   Petr Machata <petrm@mellanox.com> | 2019-07-02 19:06:47 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-07-02 15:31:20 -0700 |
| commit | dbcdb61aaf1add3fb15f24f7fcbf30c17d5c11db (patch) | |
| tree | 2e58130f3ed86d3847890a1421ee6ff053cb9760 | |
| parent | r8169: add random MAC address fallback (diff) | |
| download | linux-dev-dbcdb61aaf1add3fb15f24f7fcbf30c17d5c11db.tar.xz linux-dev-dbcdb61aaf1add3fb15f24f7fcbf30c17d5c11db.zip | |
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 <colin.king@canonical.com>
Signed-off-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |