diff options
| author | Lendacky, Thomas <Thomas.Lendacky@amd.com> | 2017-06-28 20:41:58 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-29 21:14:16 +0200 |
| commit | 93845d5f1b3c3878fdeb6275f1928217ec0c9ff2 (patch) | |
| tree | 8e9cb5c5201d5c29b4e1d7cd04cde838aec3d87a /drivers/net/ethernet/amd | |
| parent | amd-xgbe: Use the proper register during PTP initialization (diff) | |
| download | linux-93845d5f1b3c3878fdeb6275f1928217ec0c9ff2.tar.xz linux-93845d5f1b3c3878fdeb6275f1928217ec0c9ff2.zip | |
amd-xgbe: Add a check for an skb in the timestamp path
Spurious Tx timestamp interrupts can cause an oops in the Tx timestamp
processing function if a Tx timestamp skb is NULL. Add a check to insure
a Tx timestamp skb is present before attempting to use it.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c index a934bd5d0507..20685100ce12 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c @@ -1212,6 +1212,10 @@ static void xgbe_tx_tstamp(struct work_struct *work) u64 nsec; unsigned long flags; + spin_lock_irqsave(&pdata->tstamp_lock, flags); + if (!pdata->tx_tstamp_skb) + goto unlock; + if (pdata->tx_tstamp) { nsec = timecounter_cyc2time(&pdata->tstamp_tc, pdata->tx_tstamp); @@ -1223,8 +1227,9 @@ static void xgbe_tx_tstamp(struct work_struct *work) dev_kfree_skb_any(pdata->tx_tstamp_skb); - spin_lock_irqsave(&pdata->tstamp_lock, flags); pdata->tx_tstamp_skb = NULL; + +unlock: spin_unlock_irqrestore(&pdata->tstamp_lock, flags); } |