Patch "revert "ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output"" has been added to the 4.9-stable tree

[<gregkh@linuxfoundation.org>]

This is a note to let you know that I've just added the patch titled

    revert "ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output"

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-ipv4-should-use-consistent-conditional-judgement-for-ip-fragment-in-__ip_append_data-and-ip_finish_output.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 <stable@vger.kernel.org> know about it.


>From foo@baz Fri Aug 11 09:19:02 PDT 2017
Date: Fri, 11 Aug 2017 09:19:02 -0700
To: Greg KH <gregkh@linuxfoundation.org>
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: revert "ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output"

This reverts commit f102bb7164c9020e12662998f0fd99c3be72d4f6 which is
commit 0a28cfd51e17f4f0a056bcf66bfbe492c3b99f38 upstream as there is
another patch that needs to be applied instead of this one.

Cc: Zheng Li <james.z.li@ericsson.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 net/ipv4/ip_output.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -936,7 +936,7 @@ static int __ip_append_data(struct sock
 		csummode = CHECKSUM_PARTIAL;
 
 	cork->length += length;
-	if ((((length + fragheaderlen) > mtu) || (skb && skb_is_gso(skb))) &&
+	if (((length > 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) {


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