[linux] 01/01: Fix backport of "udp: consistently apply ufo or fragmentation"

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch jessie-security
in repository linux.

commit 7cfb28c034b49d5f90065d6f727bc9cb279d5c35
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Aug 18 02:38:03 2017 +0100

    Fix backport of "udp: consistently apply ufo or fragmentation"
---
 .../bugfix/all/udp-consistently-apply-ufo-or-fragmentation.patch    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/patches/bugfix/all/udp-consistently-apply-ufo-or-fragmentation.patch b/debian/patches/bugfix/all/udp-consistently-apply-ufo-or-fragmentation.patch
index f2f9094..fc87b8a 100644
--- a/debian/patches/bugfix/all/udp-consistently-apply-ufo-or-fragmentation.patch
+++ b/debian/patches/bugfix/all/udp-consistently-apply-ufo-or-fragmentation.patch
@@ -23,7 +23,9 @@ Reported-by: Andrey Konovalov <andreyknvl at google.com>
 Signed-off-by: Willem de Bruijn <willemb at google.com>
 Signed-off-by: David S. Miller <davem at davemloft.net>
 Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
-[bwh: Backported to 3.16: adjust context]
+[bwh: Backported to 3.16:
+ - ip6_append_data() doesn't take a queue parameter; use &sk->sk_write_queue
+ - Adjust context]
 ---
  net/ipv4/ip_output.c  |    7 +++++--
  net/ipv4/udp.c        |    2 +-
@@ -76,7 +78,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
 -	     (skb && skb_is_gso(skb))) &&
 +	if ((skb && skb_is_gso(skb)) ||
 +	    (((length + fragheaderlen) > mtu) &&
-+	    (skb_queue_len(queue) <= 1) &&
++	    (skb_queue_len(&sk->sk_write_queue) <= 1) &&
  	    (sk->sk_protocol == IPPROTO_UDP) &&
  	    (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len &&
 -	    (sk->sk_type == SOCK_DGRAM)) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git