drop broken sctp patch from 4.17.y

diff --git a/queue-4.17/sctp-fix-the-issue-that-pathmtu-may-be-set-lower-than-minsegment.patch b/queue-4.17/sctp-fix-the-issue-that-pathmtu-may-be-set-lower-than-minsegment.patch
deleted file mode 100644 (file)
index eed5a3d..0000000
--- a/queue-4.17/sctp-fix-the-issue-that-pathmtu-may-be-set-lower-than-minsegment.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From a65925475571953da12a9bc2082aec29d4e2c0e7 Mon Sep 17 00:00:00 2001
-From: Xin Long <lucien.xin@gmail.com>
-Date: Tue, 3 Jul 2018 16:30:47 +0800
-Subject: sctp: fix the issue that pathmtu may be set lower than MINSEGMENT
-
-From: Xin Long <lucien.xin@gmail.com>
-
-commit a65925475571953da12a9bc2082aec29d4e2c0e7 upstream.
-
-After commit b6c5734db070 ("sctp: fix the handling of ICMP Frag Needed
-for too small MTUs"), sctp_transport_update_pmtu would refetch pathmtu
-from the dst and set it to transport's pathmtu without any check.
-
-The new pathmtu may be lower than MINSEGMENT if the dst is obsolete and
-updated by .get_dst() in sctp_transport_update_pmtu. In this case, it
-could have a smaller MTU as well, and thus we should validate it
-against MINSEGMENT instead.
-
-Syzbot reported a warning in sctp_mtu_payload caused by this.
-
-This patch refetches the pathmtu by calling sctp_dst_mtu where it does
-the check against MINSEGMENT.
-
-v1->v2:
-  - refetch the pathmtu by calling sctp_dst_mtu instead as Marcelo's
-    suggestion.
-
-Fixes: b6c5734db070 ("sctp: fix the handling of ICMP Frag Needed for too small MTUs")
-Reported-by: syzbot+f0d9d7cba052f9344b03@syzkaller.appspotmail.com
-Suggested-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
-Signed-off-by: Xin Long <lucien.xin@gmail.com>
-Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
-Acked-by: Neil Horman <nhorman@tuxdriver.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/sctp/transport.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/net/sctp/transport.c
-+++ b/net/sctp/transport.c
-@@ -273,7 +273,7 @@ bool sctp_transport_update_pmtu(struct s
- 
-       if (dst) {
-               /* Re-fetch, as under layers may have a higher minimum size */
--              pmtu = SCTP_TRUNC4(dst_mtu(dst));
-+              pmtu = sctp_dst_mtu(dst);
-               change = t->pathmtu != pmtu;
-       }
-       t->pathmtu = pmtu;

diff --git a/queue-4.17/series b/queue-4.17/series
index ccfedd52290a75832482b4230d77458f1a6b41fa..34e1d6ed24ac9f2879c978d7a7d73eb1fa3577aa 100644 (file)
--- a/queue-4.17/series
+++ b/queue-4.17/series
@@ -72,7 +72,6 @@ tls-stricter-error-checking-in-zerocopy-sendmsg-path.patch
 autofs-fix-slab-out-of-bounds-read-in-getname_kernel.patch
 nsh-set-mac-len-based-on-inner-packet.patch
 netfilter-ipv6-nf_defrag-drop-skb-dst-before-queueing.patch
-sctp-fix-the-issue-that-pathmtu-may-be-set-lower-than-minsegment.patch
 bdi-fix-another-oops-in-wb_workfn.patch
 bpf-reject-any-prog-that-failed-read-only-lock.patch
 rds-avoid-unenecessary-cong_update-in-loop-transport.patch