4.9 patched for CAN-2003-0643.

5 files changed, 53 insertions, 19 deletions

diff --git a/sys-kernel/wolk-sources/ChangeLog b/sys-kernel/wolk-sources/ChangeLog
index 71d0a5d2713c..85a2c7647b46 100644
--- a/sys-kernel/wolk-sources/ChangeLog
+++ b/sys-kernel/wolk-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/wolk-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.52 2004/07/17 21:07:34 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.53 2004/08/02 11:53:22 plasmaroo Exp $
+
+*wolk-sources-4.9-r11 (02 Aug 2004)
+
+  02 Aug 2004; <plasmaroo@gentoo.org> -wolk-sources-4.9-r10.ebuild,
+  +wolk-sources-4.9-r11.ebuild, +files/wolk-sources.CAN-2003-0643.patch:
+  Patched for CAN-2003-0643.
 
 *wolk-sources-4.9-r10 (09 Jul 2004)
 *wolk-sources-4.11-r7 (09 Jul 2004)
diff --git a/sys-kernel/wolk-sources/Manifest b/sys-kernel/wolk-sources/Manifest
index 770702eb3401..dd2e725771c8 100644
--- a/sys-kernel/wolk-sources/Manifest
+++ b/sys-kernel/wolk-sources/Manifest
@@ -1,28 +1,29 @@
-MD5 de2287c750318a2be694474b413dd436 wolk-sources-4.14-r4.ebuild 2085
+MD5 da4fcc2bd670ff38eda67b35af8f4432 ChangeLog 16930
 MD5 a02f4041780da5b2b17cd9993255ae31 wolk-sources-4.11-r7.ebuild 2474
-MD5 bb74d3dd4b6dffee4a6a4c393b9e86e2 ChangeLog 16722
+MD5 de2287c750318a2be694474b413dd436 wolk-sources-4.14-r4.ebuild 2085
 MD5 6fd890f722da90b57c3c3f37ff79c75e metadata.xml 226
-MD5 df5e4fe29030380209f9841c53e55ff6 wolk-sources-4.9-r10.ebuild 5410
-MD5 5bf9836a632a861728d33f9736bb7431 files/wolk-sources.CAN-2004-0133.patch 427
-MD5 97d80d22d926fdc92ab204798ec86ab4 files/digest-wolk-sources-4.11-r7 231
+MD5 44833fd0ab00d6fe48f6d12a47880d02 wolk-sources-4.9-r11.ebuild 5504
+MD5 0f66013f643c79c97fda489618a4e2fd files/wolk-sources.CAN-2004-0535.patch 476
+MD5 d5efa40a4cca5b1a29d16204dd1f3a32 files/wolk-4.9s-page.h.patch 635
+MD5 aa193a78c4f2fdd248f992db935c7895 files/wolk-sources-4.9s.CAN-2004-0010.patch 6065
+MD5 ac42024b6e6ee1e2165914db4b22a61c files/wolk-sources.CAN-2004-0178.patch 424
 MD5 ed5662bd109ed396582f7756ac2b353a files/digest-wolk-sources-4.14-r4 87
-MD5 9cb43f53022757879c925fd0efd2be11 files/digest-wolk-sources-4.9-r10 1320
 MD5 21f3a4f186017d925067335e24db36a1 files/wolk-sources.CAN-2004-0109.patch 1877
-MD5 a61e57d5483a06f20da339d91f98fbb8 files/wolk-sources-4.9s.rtc_fix.patch 6769
-MD5 ac42024b6e6ee1e2165914db4b22a61c files/wolk-sources.CAN-2004-0178.patch 424
-MD5 e7b64a09d10444ca699e9696a4035c3e files/patches.txt 12893
 MD5 94da93ba922ec8143b6d7a8470747fb5 files/wolk-4.9s-setup.c.patch 531
-MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/wolk-sources-4.9s.munmap.patch 826
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
+MD5 5bf9836a632a861728d33f9736bb7431 files/wolk-sources.CAN-2004-0133.patch 427
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/wolk-sources.FPULockup-53804.patch 354
-MD5 d5efa40a4cca5b1a29d16204dd1f3a32 files/wolk-4.9s-page.h.patch 635
-MD5 aa193a78c4f2fdd248f992db935c7895 files/wolk-sources-4.9s.CAN-2004-0010.patch 6065
-MD5 0f66013f643c79c97fda489618a4e2fd files/wolk-sources.CAN-2004-0535.patch 476
 MD5 dc18e982f8149588a291956481885a8c files/wolk-sources.CAN-2004-0495.patch 17549
 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/wolk-sources.CAN-2004-0427.patch 460
+MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/wolk-sources.CAN-2004-0497.patch 707
+MD5 97d80d22d926fdc92ab204798ec86ab4 files/digest-wolk-sources-4.11-r7 231
+MD5 d4a740ae56c2049247083af387a22a85 files/wolk-sources.CAN-2004-0394.patch 350
+MD5 528da73c9e4a6fb017561e51dc0ab815 files/wolk-sources.CAN-2003-0643.patch 747
+MD5 d4ef22c0e842ad7a48980130bf579e6e files/wolk-4.9s-speedstep.c.patch 777
 MD5 de75cfa969ed092578d9ddda6c5be334 files/wolk-sources.CAN-2004-0181.patch 1233
+MD5 e7b64a09d10444ca699e9696a4035c3e files/patches.txt 12893
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/wolk-sources.CAN-2003-0985.patch 414
-MD5 d4ef22c0e842ad7a48980130bf579e6e files/wolk-4.9s-speedstep.c.patch 777
-MD5 d4a740ae56c2049247083af387a22a85 files/wolk-sources.CAN-2004-0394.patch 350
-MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/wolk-sources.CAN-2004-0497.patch 707
+MD5 9cb43f53022757879c925fd0efd2be11 files/digest-wolk-sources-4.9-r11 1320
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/wolk-sources.CAN-2004-0177.patch 384
+MD5 a61e57d5483a06f20da339d91f98fbb8 files/wolk-sources-4.9s.rtc_fix.patch 6769
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
+MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/wolk-sources-4.9s.munmap.patch 826
diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r10 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r11
index 1a638cec623d..1a638cec623d 100644
--- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r10
+++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r11
diff --git a/sys-kernel/wolk-sources/files/wolk-sources.CAN-2003-0643.patch b/sys-kernel/wolk-sources/files/wolk-sources.CAN-2003-0643.patch
new file mode 100644
index 000000000000..346641ee93be
--- /dev/null
+++ b/sys-kernel/wolk-sources/files/wolk-sources.CAN-2003-0643.patch
@@ -0,0 +1,26 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2003/07/25 09:53:06-07:00 kaber@trash.net 
+#   [NET]: Fix signnedness test in socket filter code.
+# 
+# net/core/filter.c
+#   2003/07/25 09:52:50-07:00 kaber@trash.net +2 -3
+#   [NET]: Fix signnedness test in socket filter code.
+# 
+diff -Nru a/net/core/filter.c b/net/core/filter.c
+--- a/net/core/filter.c	2004-06-27 19:54:06 -07:00
++++ b/net/core/filter.c	2004-06-27 19:54:06 -07:00
+@@ -294,10 +294,9 @@
+ 				goto load_b;
+ 
+ 			case BPF_LDX|BPF_B|BPF_MSH:
+-				k = fentry->k;
+-				if(k >= 0 && (unsigned int)k >= len)
++				if(fentry->k >= len)
+ 					return (0);
+-				X = (data[k] & 0xf) << 2;
++				X = (data[fentry->k] & 0xf) << 2;
+ 				continue;
+ 
+ 			case BPF_LD|BPF_IMM:
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9-r10.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9-r11.ebuild
index d2da83ad54f4..c76622cf9580 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.9-r10.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.9-r11.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/wolk-sources/wolk-sources-4.9-r10.ebuild,v 1.1 2004/07/09 18:05:47 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r11.ebuild,v 1.1 2004/08/02 11:53:22 plasmaroo Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -76,6 +76,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-4.9s.munmap.patch || die "Failed to apply munmap patch!"
 	epatch ${FILESDIR}/${PN}-4.9s.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
 	epatch ${FILESDIR}/${PN}-4.9s.CAN-2004-0010.patch || die "Failed to add the CAN-2004-0010 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2003-0643.patch || die "Failed to add the CAN-2003-0643 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0109.patch || die "Failed to add the CAN-2004-0109 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0133.patch || die "Failed to add the CAN-2004-0133 patch!"