Patch "packet: always probe for transport header" has been added to the 3.14-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2015-12-11 20:21:22
This is a note to let you know that I've just added the patch titled
packet: always probe for transport header
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
packet-always-probe-for-transport-header.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From foo@baz Fri Dec 11 11:39:46 EST 2015
From: Daniel Borkmann <daniel@iogearbox.net> Date: Wed, 11 Nov 2015 23:25:41 +0100 Subject: packet: always probe for transport header From: Daniel Borkmann <daniel@iogearbox.net> [ Upstream commit 8fd6c80d9dd938ca338c70698533a7e304752846 ] We concluded that the skb_probe_transport_header() should better be called unconditionally. Avoiding the call into the flow dissector has also not really much to do with the direct xmit mode. While it seems that only virtio_net code makes use of GSO from non RX/TX ring packet socket paths, we should probe for a transport header nevertheless before they hit devices. Reference: http://thread.gmane.org/gmane.linux.network/386173/ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Jason Wang <redacted> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- net/packet/af_packet.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c@@ -2210,8 +2210,7 @@ static int tpacket_fill_skb(struct packe len = ((to_write > len_max) ? len_max : to_write); } - if (!packet_use_direct_xmit(po)) - skb_probe_transport_header(skb, 0); + skb_probe_transport_header(skb, 0); return tp_len; }
@@ -2538,8 +2537,8 @@ static int packet_snd(struct socket *soc len += vnet_hdr_len; } - if (!packet_use_direct_xmit(po)) - skb_probe_transport_header(skb, reserve); + skb_probe_transport_header(skb, reserve); + if (unlikely(extra_len == 4)) skb->no_fcs = 1;
Patches currently in stable-queue which might be from daniel@iogearbox.net are queue-3.14/packet-infer-protocol-from-ethernet-header-if-unset.patch queue-3.14/ipv6-sctp-implement-sctp_v6_destroy_sock.patch queue-3.14/net-scm-fix-pax-detected-msg_controllen-overflow-in-scm_detach_fds.patch queue-3.14/packet-always-probe-for-transport-header.patch queue-3.14/packet-do-skb_probe_transport_header-when-we-actually-have-data.patch queue-3.14/tools-net-use-include-uapi-with-__exported_headers__.patch