From 57ea884b0dcf1e59661955919976ef138ec9cdb0 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Thu, 5 Jan 2017 02:34:28 +0100 Subject: 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 Acked-by: Sowmini Varadhan Signed-off-by: David S. Miller --- net/packet/af_packet.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'net/packet') 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(); -- cgit