From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:53674 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753324AbdHKQVQ (ORCPT ); Fri, 11 Aug 2017 12:21:16 -0400 Subject: Patch "revert "net: account for current skb length when deciding about UFO"" has been added to the 4.9-stable tree To: gregkh@linuxfoundation.org, alexander.levin@verizon.com, davem@davemloft.net, mkubecek@suse.cz, vyasevic@redhat.com Cc: , From: Date: Fri, 11 Aug 2017 09:21:11 -0700 Message-ID: <1502468471163103@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 revert "net: account for current skb length when deciding about UFO" to the 4.9-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: revert-net-account-for-current-skb-length-when-deciding-about-ufo.patch and it can be found in the queue-4.9 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 Aug 11 09:14:09 PDT 2017 Date: Fri, 11 Aug 2017 09:14:09 -0700 To: Greg KH From: Greg Kroah-Hartman Subject: revert "net: account for current skb length when deciding about UFO" This reverts commit ef09c9ff343122a0b245416066992d096416ff19 which is commit a5cb659bbc1c8644efa0c3138a757a1e432a4880 upstream as it causes merge issues with later patches that are much more important... Cc: Michal Kubecek Cc: Vlad Yasevich Cc: David S. Miller Cc: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/ipv4/ip_output.c | 3 +-- net/ipv6/ip6_output.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -936,8 +936,7 @@ static int __ip_append_data(struct sock csummode = CHECKSUM_PARTIAL; cork->length += length; - if ((((length + (skb ? skb->len : fragheaderlen)) > mtu) || - (skb && skb_is_gso(skb))) && + if ((((length + fragheaderlen) > mtu) || (skb && skb_is_gso(skb))) && (sk->sk_protocol == IPPROTO_UDP) && (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len && (sk->sk_type == SOCK_DGRAM) && !sk->sk_no_check_tx) { --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1372,7 +1372,7 @@ emsgsize: */ cork->length += length; - if ((((length + (skb ? skb->len : headersize)) > mtu) || + if ((((length + fragheaderlen) > mtu) || (skb && skb_is_gso(skb))) && (sk->sk_protocol == IPPROTO_UDP) && (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len && Patches currently in stable-queue which might be from gregkh@linuxfoundation.org are queue-4.9/net-mlx4_en-don-t-set-checksum_complete-on-sctp-packets.patch queue-4.9/tcp-avoid-setting-cwnd-to-invalid-ssthresh-after-cwnd-reduction-states.patch queue-4.9/ppp-fix-xmit-recursion-detection-on-ppp-channels.patch queue-4.9/igmp-fix-regression-caused-by-igmp-sysctl-namespace-code.patch queue-4.9/ppp-fix-false-xmit-recursion-detect-with-two-ppp-devices.patch queue-4.9/tcp-fastopen-tcp_connect-must-refresh-the-route.patch queue-4.9/bpf-s390-fix-jit-branch-offset-related-to-ldimm64.patch queue-4.9/net-avoid-skb_warn_bad_offload-false-positives-on-ufo.patch queue-4.9/net-sched-set-xt_tgchk_param-par.nft_compat-as-0-in-ipt_init_target.patch queue-4.9/revert-net-account-for-current-skb-length-when-deciding-about-ufo.patch queue-4.9/revert-ipv4-should-use-consistent-conditional-judgement-for-ip-fragment-in-__ip_append_data-and-ip_finish_output.patch queue-4.9/packet-fix-tp_reserve-race-in-packet_set_ring.patch queue-4.9/net-fix-keepalive-code-vs-tcp_fastopen_connect.patch queue-4.9/udp-consistently-apply-ufo-or-fragmentation.patch