From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:34583 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753919AbbLKUVn (ORCPT ); Fri, 11 Dec 2015 15:21:43 -0500 Subject: Patch "packet: always probe for transport header" has been added to the 4.1-stable tree To: daniel@iogearbox.net, davem@davemloft.net, gregkh@linuxfoundation.org, jasowang@redhat.com Cc: , From: Date: Fri, 11 Dec 2015 08:48:50 -0800 Message-ID: <1449852530135102@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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.1-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.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Fri Dec 11 11:39:13 EST 2015 From: Daniel Borkmann Date: Wed, 11 Nov 2015 23:25:41 +0100 Subject: packet: always probe for transport header From: Daniel Borkmann [ 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 Acked-by: Jason Wang Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- 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 @@ -2230,8 +2230,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; } @@ -2583,8 +2582,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-4.1/packet-infer-protocol-from-ethernet-header-if-unset.patch queue-4.1/bpf-array-fix-heap-out-of-bounds-access-when-updating-elements.patch queue-4.1/ipv6-sctp-implement-sctp_v6_destroy_sock.patch queue-4.1/packet-only-allow-extra-vlan-len-on-ethernet-devices.patch queue-4.1/net-scm-fix-pax-detected-msg_controllen-overflow-in-scm_detach_fds.patch queue-4.1/packet-fix-tpacket_snd-max-frame-len.patch queue-4.1/packet-always-probe-for-transport-header.patch queue-4.1/packet-do-skb_probe_transport_header-when-we-actually-have-data.patch queue-4.1/tools-net-use-include-uapi-with-__exported_headers__.patch