git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From foo@baz Fri Aug 11 09:19:02 PDT 2017
   2 Date: Fri, 11 Aug 2017 09:19:02 -0700
   3 To: Greg KH <gregkh@linuxfoundation.org>
   4 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   5 Subject: revert "ipv4: Should use consistent conditional judgement for ip fragment in __ip_append_data and ip_finish_output"
   6
   7 This reverts commit f102bb7164c9020e12662998f0fd99c3be72d4f6 which is
   8 commit 0a28cfd51e17f4f0a056bcf66bfbe492c3b99f38 upstream as there is
   9 another patch that needs to be applied instead of this one.
  10
  11 Cc: Zheng Li <james.z.li@ericsson.com>
  12 Cc: David S. Miller <davem@davemloft.net>
  13 Cc: Sasha Levin <alexander.levin@verizon.com>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  15
  16 ---
  17  net/ipv4/ip_output.c |    2 +-
  18  1 file changed, 1 insertion(+), 1 deletion(-)
  19
  20 --- a/net/ipv4/ip_output.c
  21 +++ b/net/ipv4/ip_output.c
  22 @@ -888,7 +888,7 @@ static int __ip_append_data(struct sock
  23                 csummode = CHECKSUM_PARTIAL;
  24
  25         cork->length += length;
  26 -       if ((((length + fragheaderlen) > mtu) || (skb && skb_is_gso(skb))) &&
  27 +       if (((length > mtu) || (skb && skb_is_gso(skb))) &&
  28             (sk->sk_protocol == IPPROTO_UDP) &&
  29             (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len &&
  30             (sk->sk_type == SOCK_DGRAM)) {