Version bump for the 2.6 IPTables RDoS vulnerability; bug #55694.

4 files changed, 21 insertions, 3 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index 7060e33252eb..fdd32729ee5f 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/usermode-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.38 2004/06/29 17:28:39 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.39 2004/06/30 18:10:28 plasmaroo Exp $
+
+*usermode-sources-2.6.6-r2 (30 Jun 2004)
+
+  30 Jun 2004; <plasmaroo@gentoo.org> -usermode-sources-2.6.6-r1.ebuild,
+  +usermode-sources-2.6.6-r2.ebuild,
+  +files/usermode-sources-2.6.IPTables-RDoS.patch:
+  Version bump for the 2.6 IPTables RDoS vulnerability; bug #55694.
 
 *usermode-sources-2.4.24-r5 (29 Jun 2004)
 
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r1 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r2
index 97a9c9ea6e86..97a9c9ea6e86 100644
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r1
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r2
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.IPTables-RDoS.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.IPTables-RDoS.patch
new file mode 100644
index 000000000000..8f89d1605c9a
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.IPTables-RDoS.patch
@@ -0,0 +1,11 @@
+--- net/ipv4/netfilter/ip_tables.c.orig	2004-04-04 05:36:47.000000000 +0200
++++ net/ipv4/netfilter/ip_tables.c	2004-06-24 21:24:26.000000000 +0200
+@@ -1461,7 +1461,7 @@
+ 		int *hotdrop)
+ {
+ 	/* tcp.doff is only 4 bits, ie. max 15 * 4 bytes */
+-	char opt[60 - sizeof(struct tcphdr)];
++	u_int8_t opt[60 - sizeof(struct tcphdr)];
+ 	unsigned int i;
+ 
+ 	duprintf("tcp_match: finding option\n");
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.6-r1.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.6-r2.ebuild
index a4a3226883d7..19fb9bd83eb7 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.6.6-r1.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.6-r1.ebuild,v 1.2 2004/06/24 23:01:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.6-r2.ebuild,v 1.1 2004/06/30 18:10:28 plasmaroo Exp $
 
 K_NOUSENAME="yes"
 ETYPE="sources"
@@ -13,7 +13,7 @@ KV="${OKV}${EXTRAVERSION}"
 S="${WORKDIR}/linux-${KV}"
 IUSE=""
 
-UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2 ${FILESDIR}/${P}.FPULockup-53804.patch"
+UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2 ${FILESDIR}/${P}.FPULockup-53804.patch ${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch"
 
 DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV}.tar.bz2