]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
release Linux 2.6.17.1 with SCTP security fix v2.6.17.1
authorChris Wright <chrisw@sous-sol.org>
Tue, 20 Jun 2006 09:46:54 +0000 (02:46 -0700)
committerChris Wright <chrisw@sous-sol.org>
Tue, 20 Jun 2006 09:46:54 +0000 (02:46 -0700)
releases/2.6.17.1/series [new file with mode: 0644]
releases/2.6.17.1/xt_sctp-fix-endless-loop-caused-by-0-chunk-length.patch [new file with mode: 0644]

diff --git a/releases/2.6.17.1/series b/releases/2.6.17.1/series
new file mode 100644 (file)
index 0000000..7e97316
--- /dev/null
@@ -0,0 +1 @@
+xt_sctp-fix-endless-loop-caused-by-0-chunk-length.patch
diff --git a/releases/2.6.17.1/xt_sctp-fix-endless-loop-caused-by-0-chunk-length.patch b/releases/2.6.17.1/xt_sctp-fix-endless-loop-caused-by-0-chunk-length.patch
new file mode 100644 (file)
index 0000000..b1460ac
--- /dev/null
@@ -0,0 +1,28 @@
+From stable-bounces@linux.kernel.org  Mon Jun 19 10:18:30 2006
+Date: Mon, 19 Jun 2006 19:14:21 +0200
+From: Patrick McHardy <kaber@trash.net>
+To: "David S. Miller" <davem@davemloft.net>
+Cc: security@kernel.org, stable@kernel.org
+Subject: [NETFILTER]: xt_sctp: fix endless loop caused by 0 chunk length (CVE-2006-3085)
+
+Fix endless loop in the SCTP match similar to those already fixed in the
+SCTP conntrack helper (was CVE-2006-1527).
+
+Signed-off-by: Patrick McHardy <kaber@trash.net>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ net/netfilter/xt_sctp.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.17.orig/net/netfilter/xt_sctp.c
++++ linux-2.6.17/net/netfilter/xt_sctp.c
+@@ -62,7 +62,7 @@ match_packet(const struct sk_buff *skb,
+       do {
+               sch = skb_header_pointer(skb, offset, sizeof(_sch), &_sch);
+-              if (sch == NULL) {
++              if (sch == NULL || sch->length == 0) {
+                       duprintf("Dropping invalid SCTP packet.\n");
+                       *hotdrop = 1;
+                       return 0;