4.4-stable patches

added patches:
	fix-net-ipv4-do-not-handle-duplicate-fragments-as-overlapping.patch

diff --git a/queue-4.4/fix-net-ipv4-do-not-handle-duplicate-fragments-as-overlapping.patch b/queue-4.4/fix-net-ipv4-do-not-handle-duplicate-fragments-as-overlapping.patch
new file mode 100644 (file)
index 0000000..afcc7fd
--- /dev/null
+++ b/queue-4.4/fix-net-ipv4-do-not-handle-duplicate-fragments-as-overlapping.patch
@@ -0,0 +1,43 @@
+From foo@baz Thu Jan 31 15:59:51 CET 2019
+Date: Thu, 31 Jan 2019 15:59:51 +0100
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: Fix "net: ipv4: do not handle duplicate fragments as overlapping"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+ade446403bfb ("net: ipv4: do not handle duplicate fragments as
+overlapping") was backported to many stable trees, but it had a problem
+that was "accidentally" fixed by the upstream commit 0ff89efb5246 ("ip:
+fail fast on IP defrag errors")
+
+This is the fixup for that problem as we do not want the larger patch in
+the older stable trees.
+
+Fixes: ade446403bfb ("net: ipv4: do not handle duplicate fragments as overlapping")
+Reported-by: Ivan Babrou <ivan@cloudflare.com>
+Reported-by: Eric Dumazet <edumazet@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/ipv4/ip_fragment.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/ipv4/ip_fragment.c
++++ b/net/ipv4/ip_fragment.c
+@@ -478,6 +478,7 @@ static int ip_frag_queue(struct ipq *qp,
+        * fragment.
+        */
+ 
++      err = -EINVAL;
+       /* Find out where to put this fragment.  */
+       prev_tail = qp->q.fragments_tail;
+       if (!prev_tail)
+@@ -556,7 +557,6 @@ static int ip_frag_queue(struct ipq *qp,
+ 
+ discard_qp:
+       ipq_kill(qp);
+-      err = -EINVAL;
+       IP_INC_STATS(net, IPSTATS_MIB_REASM_OVERLAPS);
+ err:
+       kfree_skb(skb);

diff --git a/queue-4.4/series b/queue-4.4/series
index d5abee1b5ab66ebd25e0a81ff643f6d85b89f3eb..e1a91c500dd1283a583add85a8a3c50c424e3f4c 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -62,3 +62,4 @@ ip-process-in-order-fragments-efficiently.patch
 net-ipv4-do-not-handle-duplicate-fragments-as-overlapping.patch
 ip-frags-fix-crash-in-ip_do_fragment.patch
 ipv4-frags-precedence-bug-in-ip_expire.patch
+fix-net-ipv4-do-not-handle-duplicate-fragments-as-overlapping.patch