From 59d8701f6bbd4c3ab8be3304d5017dbdf2a1583e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 31 Jan 2019 16:03:55 +0100 Subject: [PATCH] 4.9-stable patches added patches: fix-net-ipv4-do-not-handle-duplicate-fragments-as-overlapping.patch --- queue-4.14/series | 1 + queue-4.19/series | 1 + ...e-duplicate-fragments-as-overlapping.patch | 43 +++++++++++++++++++ queue-4.9/series | 1 + 4 files changed, 46 insertions(+) create mode 100644 queue-4.14/series create mode 100644 queue-4.19/series create mode 100644 queue-4.9/fix-net-ipv4-do-not-handle-duplicate-fragments-as-overlapping.patch create mode 100644 queue-4.9/series diff --git a/queue-4.14/series b/queue-4.14/series new file mode 100644 index 00000000000..dd28db7345b --- /dev/null +++ b/queue-4.14/series @@ -0,0 +1 @@ +fix-net-ipv4-do-not-handle-duplicate-fragments-as-overlapping.patch diff --git a/queue-4.19/series b/queue-4.19/series new file mode 100644 index 00000000000..dd28db7345b --- /dev/null +++ b/queue-4.19/series @@ -0,0 +1 @@ +fix-net-ipv4-do-not-handle-duplicate-fragments-as-overlapping.patch diff --git a/queue-4.9/fix-net-ipv4-do-not-handle-duplicate-fragments-as-overlapping.patch b/queue-4.9/fix-net-ipv4-do-not-handle-duplicate-fragments-as-overlapping.patch new file mode 100644 index 00000000000..e6d3fd7b0c6 --- /dev/null +++ b/queue-4.9/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 +From: Greg Kroah-Hartman +Subject: Fix "net: ipv4: do not handle duplicate fragments as overlapping" + +From: Greg Kroah-Hartman + +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 +Reported-by: Eric Dumazet +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -423,6 +423,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) +@@ -499,7 +500,6 @@ static int ip_frag_queue(struct ipq *qp, + + discard_qp: + inet_frag_kill(&qp->q); +- err = -EINVAL; + __IP_INC_STATS(net, IPSTATS_MIB_REASM_OVERLAPS); + err: + kfree_skb(skb); diff --git a/queue-4.9/series b/queue-4.9/series new file mode 100644 index 00000000000..dd28db7345b --- /dev/null +++ b/queue-4.9/series @@ -0,0 +1 @@ +fix-net-ipv4-do-not-handle-duplicate-fragments-as-overlapping.patch -- 2.47.2