Linux 2.6.16.23

Linux 2.6.16.23

[Greg KH]

We (the -stable team) are announcing the release of the 2.6.16.23 kernel.
Another SCTP remote crash fix, CVE-2006-2934, and a revert of a Kconfig
change that should have have gone into the 2.6.16-stable tree.

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

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

thanks,

greg k-h

--------

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

Summary of changes from v2.6.16.22 to v2.6.16.23
================================================

Chris Wright:
      revert PARPORT_SERIAL should depend on SERIAL_8250_PCI patch

Greg Kroah-Hartman:
      Linux 2.6.16.23

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

Re: Linux 2.6.16.23

[Greg KH]

diff --git a/Makefile b/Makefile
index 4b2bb08..da3e313 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 16
-EXTRAVERSION = .22
+EXTRAVERSION = .23
 NAME=Sliding Snow Leopard
 
 # *DOCUMENTATION*
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig
index 6c8452e..f63c387 100644
--- a/drivers/parport/Kconfig
+++ b/drivers/parport/Kconfig
@@ -48,7 +48,7 @@ config PARPORT_PC
 
 config PARPORT_SERIAL
 	tristate "Multi-IO cards (parallel and serial)"
-	depends on SERIAL_8250_PCI && PARPORT_PC && PCI
+	depends on SERIAL_8250 && PARPORT_PC && PCI
 	help
 	  This adds support for multi-IO PCI cards that have parallel and
 	  serial ports.  You should say Y or M here.  If you say M, the module
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_sctp.c b/net/ipv4/netfilter/ip_conntrack_proto_sctp.c
index df67679..b82be93 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 cd2326d..7fcd1dd 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,