From: Sasha Levin Date: Thu, 23 Feb 2023 12:12:35 +0000 (-0500) Subject: Drop revert-netfilter-conntrack-fix-bug-in-for_each_sctp_.patch X-Git-Tag: v6.2.1~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba8f1a2de0c6d7d56d17a26e02b0bc371245db86;p=thirdparty%2Fkernel%2Fstable-queue.git Drop revert-netfilter-conntrack-fix-bug-in-for_each_sctp_.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/revert-netfilter-conntrack-fix-bug-in-for_each_sctp_.patch b/queue-4.14/revert-netfilter-conntrack-fix-bug-in-for_each_sctp_.patch deleted file mode 100644 index 021cc4aa710..00000000000 --- a/queue-4.14/revert-netfilter-conntrack-fix-bug-in-for_each_sctp_.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0e7528b091ccdcf79892af732c349830c6d78d7d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 26 Jan 2023 02:35:21 +0100 -Subject: Revert "netfilter: conntrack: fix bug in for_each_sctp_chunk" - -From: Florian Westphal - -[ Upstream commit bd0e06f0def75ba26572a94e5350324474a55562 ] - -There is no bug. If sch->length == 0, this would result in an infinite -loop, but first caller, do_basic_checks(), errors out in this case. - -After this change, packets with bogus zero-length chunks are no longer -detected as invalid, so revert & add comment wrt. 0 length check. - -Fixes: 98ee00774525 ("netfilter: conntrack: fix bug in for_each_sctp_chunk") -Signed-off-by: Florian Westphal -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/netfilter/nf_conntrack_proto_sctp.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c -index cffd37f56c5c0..6166c2012e0d8 100644 ---- a/net/netfilter/nf_conntrack_proto_sctp.c -+++ b/net/netfilter/nf_conntrack_proto_sctp.c -@@ -182,10 +182,11 @@ static void sctp_print_conntrack(struct seq_file *s, struct nf_conn *ct) - } - #endif - -+/* do_basic_checks ensures sch->length > 0, do not use before */ - #define for_each_sctp_chunk(skb, sch, _sch, offset, dataoff, count) \ - for ((offset) = (dataoff) + sizeof(struct sctphdr), (count) = 0; \ -- ((sch) = skb_header_pointer((skb), (offset), sizeof(_sch), &(_sch))) && \ -- (sch)->length; \ -+ (offset) < (skb)->len && \ -+ ((sch) = skb_header_pointer((skb), (offset), sizeof(_sch), &(_sch))); \ - (offset) += (ntohs((sch)->length) + 3) & ~3, (count)++) - - /* Some validity checks to make sure the chunks are fine */ --- -2.39.0 - diff --git a/queue-4.14/series b/queue-4.14/series index bad3505fdd0..d43e5d1d8bd 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -2,7 +2,6 @@ wifi-rtl8xxxu-gen2-turn-on-the-rate-control.patch powerpc-dts-t208x-mark-mac1-and-mac2-as-10g.patch random-always-mix-cycle-counter-in-add_latent_entrop.patch powerpc-dts-t208x-disable-10g-on-mac1-and-mac2.patch -revert-netfilter-conntrack-fix-bug-in-for_each_sctp_.patch alarmtimer-prevent-starvation-by-small-intervals-and-sig_ign.patch uaccess-add-speculation-barrier-to-copy_from_user.patch wifi-mwifiex-add-missing-compatible-string-for-sd8787.patch diff --git a/queue-5.15/revert-netfilter-conntrack-fix-bug-in-for_each_sctp_.patch b/queue-5.15/revert-netfilter-conntrack-fix-bug-in-for_each_sctp_.patch deleted file mode 100644 index 576c7530ba0..00000000000 --- a/queue-5.15/revert-netfilter-conntrack-fix-bug-in-for_each_sctp_.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4150cc92b62d2b9c9b8fd3adcc751f6c91a11741 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 26 Jan 2023 02:35:21 +0100 -Subject: Revert "netfilter: conntrack: fix bug in for_each_sctp_chunk" - -From: Florian Westphal - -[ Upstream commit bd0e06f0def75ba26572a94e5350324474a55562 ] - -There is no bug. If sch->length == 0, this would result in an infinite -loop, but first caller, do_basic_checks(), errors out in this case. - -After this change, packets with bogus zero-length chunks are no longer -detected as invalid, so revert & add comment wrt. 0 length check. - -Fixes: 98ee00774525 ("netfilter: conntrack: fix bug in for_each_sctp_chunk") -Signed-off-by: Florian Westphal -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/netfilter/nf_conntrack_proto_sctp.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c -index 444f02271b36a..490b11192e8aa 100644 ---- a/net/netfilter/nf_conntrack_proto_sctp.c -+++ b/net/netfilter/nf_conntrack_proto_sctp.c -@@ -142,10 +142,11 @@ static void sctp_print_conntrack(struct seq_file *s, struct nf_conn *ct) - } - #endif - -+/* do_basic_checks ensures sch->length > 0, do not use before */ - #define for_each_sctp_chunk(skb, sch, _sch, offset, dataoff, count) \ - for ((offset) = (dataoff) + sizeof(struct sctphdr), (count) = 0; \ -- ((sch) = skb_header_pointer((skb), (offset), sizeof(_sch), &(_sch))) && \ -- (sch)->length; \ -+ (offset) < (skb)->len && \ -+ ((sch) = skb_header_pointer((skb), (offset), sizeof(_sch), &(_sch))); \ - (offset) += (ntohs((sch)->length) + 3) & ~3, (count)++) - - /* Some validity checks to make sure the chunks are fine */ --- -2.39.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 2313e466e6a..82e3cc46b1f 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -18,7 +18,6 @@ powerpc-vmlinux.lds-ensure-strict_align_size-is-at-l.patch powerpc-vmlinux.lds-add-an-explicit-symbol-for-the-s.patch powerpc-64s-radix-fix-crash-with-unaligned-relocated.patch powerpc-64s-radix-fix-rwx-mapping-with-relocated-ker.patch -revert-netfilter-conntrack-fix-bug-in-for_each_sctp_.patch drm-i915-gvt-fix-double-free-bug-in-split_2mb_gtt_entry.patch uaccess-add-speculation-barrier-to-copy_from_user.patch binder-read-pre-translated-fds-from-sender-buffer.patch diff --git a/queue-6.1/revert-netfilter-conntrack-fix-bug-in-for_each_sctp_.patch b/queue-6.1/revert-netfilter-conntrack-fix-bug-in-for_each_sctp_.patch deleted file mode 100644 index 7b4696f68a9..00000000000 --- a/queue-6.1/revert-netfilter-conntrack-fix-bug-in-for_each_sctp_.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d9d9c2ee2bd9adc43afa74981da8f9976c87eef0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 26 Jan 2023 02:35:21 +0100 -Subject: Revert "netfilter: conntrack: fix bug in for_each_sctp_chunk" - -From: Florian Westphal - -[ Upstream commit bd0e06f0def75ba26572a94e5350324474a55562 ] - -There is no bug. If sch->length == 0, this would result in an infinite -loop, but first caller, do_basic_checks(), errors out in this case. - -After this change, packets with bogus zero-length chunks are no longer -detected as invalid, so revert & add comment wrt. 0 length check. - -Fixes: 98ee00774525 ("netfilter: conntrack: fix bug in for_each_sctp_chunk") -Signed-off-by: Florian Westphal -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Sasha Levin ---- - net/netfilter/nf_conntrack_proto_sctp.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c -index 444f02271b36a..490b11192e8aa 100644 ---- a/net/netfilter/nf_conntrack_proto_sctp.c -+++ b/net/netfilter/nf_conntrack_proto_sctp.c -@@ -142,10 +142,11 @@ static void sctp_print_conntrack(struct seq_file *s, struct nf_conn *ct) - } - #endif - -+/* do_basic_checks ensures sch->length > 0, do not use before */ - #define for_each_sctp_chunk(skb, sch, _sch, offset, dataoff, count) \ - for ((offset) = (dataoff) + sizeof(struct sctphdr), (count) = 0; \ -- ((sch) = skb_header_pointer((skb), (offset), sizeof(_sch), &(_sch))) && \ -- (sch)->length; \ -+ (offset) < (skb)->len && \ -+ ((sch) = skb_header_pointer((skb), (offset), sizeof(_sch), &(_sch))); \ - (offset) += (ntohs((sch)->length) + 3) & ~3, (count)++) - - /* Some validity checks to make sure the chunks are fine */ --- -2.39.0 - diff --git a/queue-6.1/series b/queue-6.1/series index ffd4e19e0bb..afb6008baa4 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -24,7 +24,6 @@ drm-i915-remove-__maybe_unused-from-mtl_info.patch kvm-x86-fix-deadlock-for-kvm_xen_evtchn_reset.patch selftests-kvm-move-declaration-at-the-beginning-of-m.patch powerpc-64s-radix-fix-rwx-mapping-with-relocated-ker.patch -revert-netfilter-conntrack-fix-bug-in-for_each_sctp_.patch nfp-ethtool-support-reporting-link-modes.patch nfp-ethtool-fix-the-bug-of-setting-unsupported-port-.patch uaccess-add-speculation-barrier-to-copy_from_user.patch