This is a note to let you know that I've just added the patch titled packet: always probe for transport header to the 4.3-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-4.3 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Fri Dec 11 11:38:06 EST 2015 From: Daniel Borkmann <daniel@xxxxxxxxxxxxx> Date: Wed, 11 Nov 2015 23:25:41 +0100 Subject: packet: always probe for transport header From: Daniel Borkmann <daniel@xxxxxxxxxxxxx> [ 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@xxxxxxxxxxxxx> Acked-by: Jason Wang <jasowang@xxxxxxxxxx> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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 @@ -2447,8 +2447,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; } @@ -2800,8 +2799,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@xxxxxxxxxxxxx are queue-4.3/packet-infer-protocol-from-ethernet-header-if-unset.patch queue-4.3/bpf-array-fix-heap-out-of-bounds-access-when-updating-elements.patch queue-4.3/ipv6-sctp-implement-sctp_v6_destroy_sock.patch queue-4.3/packet-only-allow-extra-vlan-len-on-ethernet-devices.patch queue-4.3/net-scm-fix-pax-detected-msg_controllen-overflow-in-scm_detach_fds.patch queue-4.3/packet-fix-tpacket_snd-max-frame-len.patch queue-4.3/packet-always-probe-for-transport-header.patch queue-4.3/packet-do-skb_probe_transport_header-when-we-actually-have-data.patch queue-4.3/tools-net-use-include-uapi-with-__exported_headers__.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html