This commit was manufactured by cvs2git to create branch 'LINUX_2_6_16'.

Cherrypick from master 2006-06-30 18:59:34 UTC Adam Gołębiowski <adamg@pld-linux.org> '- new':
    kernel-CVE-2006-2934.patch -> 1.1
    kernel-xen-extra.config -> 1.1

diff --git a/kernel-CVE-2006-2934.patch b/kernel-CVE-2006-2934.patch
new file mode 100644 (file)
index 0000000..59f92f8
--- /dev/null
+++ b/kernel-CVE-2006-2934.patch
@@ -0,0 +1,22 @@
+--- linux-2.6.16/net/ipv4/netfilter/ip_conntrack_proto_sctp.c~ 2006-06-29 12:23:07.000000000 +0200
++++ linux-2.6.16/net/ipv4/netfilter/ip_conntrack_proto_sctp.c  2006-06-30 20:49:49.000000000 +0200
+@@ -254,7 +254,7 @@
+       }
+ 
+       DEBUGP("Basic checks passed\n");
+-      return 0;
++      return count == 0;
+ }
+ 
+ static int new_state(enum ip_conntrack_dir dir,
+--- linux-2.6.16/net/netfilter/nf_conntrack_proto_sctp.c~      2006-06-29 12:23:07.000000000 +0200
++++ linux-2.6.16/net/netfilter/nf_conntrack_proto_sctp.c       2006-06-30 20:50:04.000000000 +0200
+@@ -259,7 +259,7 @@
+       }
+ 
+       DEBUGP("Basic checks passed\n");
+-      return 0;
++      return count == 0;
+ }
+ 
+ static int new_state(enum ip_conntrack_dir dir,

diff --git a/kernel-xen-extra.config b/kernel-xen-extra.config
new file mode 100644 (file)
index 0000000..a695810
--- /dev/null
+++ b/kernel-xen-extra.config
@@ -0,0 +1,3 @@
+# CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_SMP_ALTERNATIVES is not set