Linux 2.6.17.3

Linux 2.6.17.3

[Chris Wright]

We (the -stable team) are announcing the release of the 2.6.17.3 kernel.
Another SCTP remote crash fix, CVE-2006-2934.

I'll also be replying to this message with a copy of the patch between
2.6.17.2 and 2.6.17.3, as it is small enough to do so.

The updated 2.6.17.y git tree can be found at:
 	git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.17.y.git
and can be browsed at the normal kernel.org git web browser:
	www.kernel.org/git/

thanks,
-chris

--------

 Makefile                                     |    2 +-
 net/ipv4/netfilter/ip_conntrack_proto_sctp.c |    2 +-
 net/netfilter/nf_conntrack_proto_sctp.c      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Summary of changes from v2.6.17.2 to v2.6.17.3
================================================

Chris Wright:
      Linux 2.6.17.3

Patrick McHardy:
      NETFILTER: SCTP conntrack: fix crash triggered by packet without chunks [CVE-2006-2934]

Re: Linux 2.6.17.3

[Chris Wright]

diff --git a/Makefile b/Makefile
index 7b3837f..8c72521 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 17
-EXTRAVERSION = .2
+EXTRAVERSION = .3
 NAME=Crazed Snow-Weasel
 
 # *DOCUMENTATION*
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
index 0416073..2d3612c 100644
--- a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
+++ b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
@@ -254,7 +254,7 @@ static int do_basic_checks(struct ip_con
 	}
 
 	DEBUGP("Basic checks passed\n");
-	return 0;
+	return count == 0;
 }
 
 static int new_state(enum ip_conntrack_dir dir,
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
index 0c6da49..9dab81d 100644
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -259,7 +259,7 @@ static int do_basic_checks(struct nf_con
 	}
 
 	DEBUGP("Basic checks passed\n");
-	return 0;
+	return count == 0;
 }
 
 static int new_state(enum ip_conntrack_dir dir,