From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 11 May 2017 10:12:00 +0000 (+0200)
Subject: remove queue-4.9/net-adjust-skb-truesize-in-___pskb_trim.patch
X-Git-Tag: v4.4.68~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23e37ee468d39d1fca2cc63e7a900b6ce0112f8a;p=thirdparty%2Fkernel%2Fstable-queue.git

remove queue-4.9/net-adjust-skb-truesize-in-___pskb_trim.patch
---

diff --git a/queue-4.9/net-adjust-skb-truesize-in-___pskb_trim.patch b/queue-4.9/net-adjust-skb-truesize-in-___pskb_trim.patch
deleted file mode 100644
index ca7b08ce580..00000000000
--- a/queue-4.9/net-adjust-skb-truesize-in-___pskb_trim.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From foo@baz Thu May 11 11:08:24 CEST 2017
-From: Eric Dumazet <edumazet@google.com>
-Date: Wed, 26 Apr 2017 09:07:46 -0700
-Subject: net: adjust skb->truesize in ___pskb_trim()
-
-From: Eric Dumazet <edumazet@google.com>
-
-
-[ Upstream commit c21b48cc1bbf2f5af3ef54ada559f7fadf8b508b ]
-
-Andrey found a way to trigger the WARN_ON_ONCE(delta < len) in
-skb_try_coalesce() using syzkaller and a filter attached to a TCP
-socket.
-
-As we did recently in commit 158f323b9868 ("net: adjust skb->truesize in
-pskb_expand_head()") we can adjust skb->truesize from ___pskb_trim(),
-via a call to skb_condense().
-
-If all frags were freed, then skb->truesize can be recomputed.
-
-This call can be done if skb is not yet owned, or destructor is
-sock_edemux().
-
-Signed-off-by: Eric Dumazet <edumazet@google.com>
-Reported-by: Andrey Konovalov <andreyknvl@google.com>
-Cc: Willem de Bruijn <willemb@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/core/skbuff.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -1572,6 +1572,8 @@ done:
- 		skb_set_tail_pointer(skb, len);
- 	}
- 
-+	if (!skb->sk || skb->destructor == sock_edemux)
-+		skb_condense(skb);
- 	return 0;
- }
- EXPORT_SYMBOL(___pskb_trim);
diff --git a/queue-4.9/series b/queue-4.9/series
index 7409af1b467..e742513ab84 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -83,7 +83,6 @@ alsa-hda-fix-deadlock-of-controller-device-lock-at-unbinding.patch
 sparc64-fix-fault-handling-in-ngbzero.s-and-genbzero.s.patch
 macsec-dynamically-allocate-space-for-sglist.patch
 tcp-do-not-underestimate-skb-truesize-in-tcp_trim_head.patch
-net-adjust-skb-truesize-in-___pskb_trim.patch
 bpf-enhance-verifier-to-understand-stack-pointer-arithmetic.patch
 bpf-arm64-fix-jit-branch-offset-related-to-ldimm64.patch
 tcp-fix-wraparound-issue-in-tcp_lp.patch