Commit 57ea884b authored Jan 05, 2017 by Daniel Borkmann Committed by David S. Miller Jan 04, 2017

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 7f953ab2 ("af_packet:
TX_RING support for TPACKET_V3") it's not anymore. Fix it by filling
the timestamp back into the ring slot.

Fixes: 7f953ab2 ("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>

parent 59527581

net/packet/af_packet.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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();

Admin message