From: Greg Kroah-Hartman Date: Fri, 20 Jul 2018 09:52:17 +0000 (+0200) Subject: drop broken sctp patch from 4.17.y X-Git-Tag: v3.18.116~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95eb32f88382083515e184b758c388c55319cf3a;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index eed5a3da02c..00000000000 --- 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 -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 - -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 -Signed-off-by: Xin Long -Acked-by: Marcelo Ricardo Leitner -Acked-by: Neil Horman -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman - ---- - 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 ccfedd52290..34e1d6ed24a 100644 --- 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