net: stmmac: fix NULL pointer dereference in stmmac_get_tx_hwtstamp

Browse source

When timestamping is enabled, stmmac_tx_clean will call
stmmac_get_tx_hwtstamp to get tx TS.
But the skb can be NULL because the last of its tx_skbuff is NULL
if this packet frame is filled in more than one descriptors.

To fix the issue, change the code:
- Store TX skb to the tx_skbuff[] of frame's last segment.
- Check skb is not NULL in stmmac_get_tx_hwtstamp.

Signed-off-by: Bruce Liu <damuzi000@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

damuzi000 2014-01-17 23:47:59 +08:00 • committed by David S. Miller

parent af0bd4e9ba

commit 75e4364f67

3 changed files with 21 additions and 19 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

drivers/net/ethernet/stmicro/stmmac/chain_mode.c

View file

2

drivers/net/ethernet/stmicro/stmmac/ring_mode.c

View file

35

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

View file