summaryrefslogtreecommitdiffstats
path: root/net/packet
diff options
context:
space:
mode:
authorDaniel Borkmann <daniel@iogearbox.net>2017-01-05 02:34:28 +0100
committerDavid S. Miller <davem@davemloft.net>2017-01-04 23:55:42 -0500
commit57ea884b0dcf1e59661955919976ef138ec9cdb0 (patch)
tree3903d94507481ffceb4514f46233141f4fc82ded /net/packet
parent5952758101fb55844957a8d4fe88402d9827cfb4 (diff)
downloadlinux-stable-57ea884b0dcf1e59661955919976ef138ec9cdb0.tar.gz
linux-stable-57ea884b0dcf1e59661955919976ef138ec9cdb0.tar.bz2
linux-stable-57ea884b0dcf1e59661955919976ef138ec9cdb0.zip
packet: fix panic in __packet_set_timestamp on tpacket_v3 in tx mode
When TX timestamping is in use with TPACKET_V3's TX ring, then we'll hit the BUG() in __packet_set_timestamp() when ring buffer slot is returned to user space via tpacket_destruct_skb(). This is due to v3 being assumed as unreachable here, but since 7f953ab2ba46 ("af_packet: TX_RING support for TPACKET_V3") it's not anymore. Fix it by filling the timestamp back into the ring slot. Fixes: 7f953ab2ba46 ("af_packet: TX_RING support for TPACKET_V3") Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Sowmini Varadhan <sowmini.varadhan@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet')
-rw-r--r--net/packet/af_packet.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 7e39087d519b..ddbda255b6ae 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -481,6 +481,9 @@ static __u32 __packet_set_timestamp(struct packet_sock *po, void *frame,
h.h2->tp_nsec = ts.tv_nsec;
break;
case TPACKET_V3:
+ h.h3->tp_sec = ts.tv_sec;
+ h.h3->tp_nsec = ts.tv_nsec;
+ break;
default:
WARN(1, "TPACKET version not supported.\n");
BUG();