Added patches to address the security vulnerabilities in bugs #37292 and #37317.

13 files changed, 244 insertions, 65 deletions

diff --git a/sys-kernel/win4lin-sources/ChangeLog b/sys-kernel/win4lin-sources/ChangeLog
index be0838cbd06f..976c09f54c44 100644
--- a/sys-kernel/win4lin-sources/ChangeLog
+++ b/sys-kernel/win4lin-sources/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-kernel/win4lin-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.11 2003/12/30 01:02:29 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.12 2004/01/06 21:48:33 plasmaroo Exp $
+
+*win4lin-sources-2.6.0-r1 (06 Jan 2004)
+
+  06 Jan 2004; <plasmaroo@gentoo.org> win4lin-sources-2.4.20-r1.ebuild,
+  win4lin-sources-2.4.22-r1.ebuild, win4lin-sources-2.4.22.ebuild,
+  win4lin-sources-2.4.23-r1.ebuild, win4lin-sources-2.4.23.ebuild,
+  win4lin-sources-2.6.0-r1.ebuild, win4lin-sources-2.6.0.ebuild,
+  files/win4lin-sources-2.4.CAN-2003-0985.patch,
+  files/win4lin-sources-2.4.rtc_fix.patch,
+  files/win4lin-sources-2.6.CAN-2003-0985.patch:
+  Added patches to address the security vulnerabilities in bugs #37292 and
+  #37317. Removed old unpatched releases and the 2.4.20-r1 release.
 
 *win4lin-sources-2.6.0 (30 Dec 2003)
 
diff --git a/sys-kernel/win4lin-sources/Manifest b/sys-kernel/win4lin-sources/Manifest
index 183a7379ae31..e2c1c78eff84 100644
--- a/sys-kernel/win4lin-sources/Manifest
+++ b/sys-kernel/win4lin-sources/Manifest
@@ -1,11 +1,12 @@
-MD5 fbd80aeaa11895575b4f417db55e86c7 ChangeLog 1777
-MD5 d2facb4fa69fac3bd8f57a1282e248ad win4lin-sources-2.4.23.ebuild 1089
+MD5 1cd23e34b7701dd97b7b17a35178deb8 win4lin-sources-2.4.23-r1.ebuild 1282
+MD5 b7cdad7c05c3fdbd2325af0ac6c95685 ChangeLog 2374
+MD5 211802a779513f27a75b2191eb8ba494 win4lin-sources-2.6.0-r1.ebuild 2947
 MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
-MD5 0deeef013192d80cc8456e31e09c419c win4lin-sources-2.4.22.ebuild 1168
-MD5 2dd30f7c7931a79d0d46ec0e2590fc14 win4lin-sources-2.4.20-r1.ebuild 1364
-MD5 eb8994bf4c655d0a2b49ab37f983200f win4lin-sources-2.6.0.ebuild 2846
-MD5 6a326a3a66a6d310eaaf77ff2868eeae files/digest-win4lin-sources-2.4.23 201
-MD5 a3ac6282b407aaef5e22644f04ce59ee files/digest-win4lin-sources-2.4.22 201
-MD5 ec72e31e51b6973ced56cfac1c6f0878 files/digest-win4lin-sources-2.4.20-r1 201
-MD5 9ff5d3f2304f1d4f66f1f527dfce6356 files/digest-win4lin-sources-2.6.0 207
+MD5 1b1dc4f914b5aa98fbd228f8d4230462 win4lin-sources-2.4.22-r1.ebuild 1373
+MD5 9ff5d3f2304f1d4f66f1f527dfce6356 files/digest-win4lin-sources-2.6.0-r1 207
+MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/win4lin-sources-2.4.rtc_fix.patch 7073
+MD5 d641cd49ae63ca2989672d2209691bb5 files/win4lin-sources-2.4.CAN-2003-0985.patch 414
+MD5 6a326a3a66a6d310eaaf77ff2868eeae files/digest-win4lin-sources-2.4.23-r1 201
+MD5 a3ac6282b407aaef5e22644f04ce59ee files/digest-win4lin-sources-2.4.22-r1 201
+MD5 05f3097edb6fd323d0ddf083fb25f838 files/win4lin-sources-2.6.CAN-2003-0985.patch 414
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.20-r1 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.20-r1
deleted file mode 100644
index 327dc7cee1d2..000000000000
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.20-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 32e4cda45fa0f090dffa157bc4504a4e mki-adapter.patch 181483
-MD5 393b5808d399426e18ea9da24d428b62 Kernel-Win4Lin3-2.4.20.patch 22588
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.22 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.22-r1
index c97f53086d19..c97f53086d19 100644
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.22
+++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.22-r1
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.23 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.23-r1
index c0bee3c77be1..c0bee3c77be1 100644
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.23
+++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.23-r1
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.0 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.0-r1
index a276a12a67b4..a276a12a67b4 100644
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.0
+++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.0-r1
diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.CAN-2003-0985.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.CAN-2003-0985.patch
new file mode 100644
index 000000000000..bacef69f02f8
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.CAN-2003-0985.patch
@@ -0,0 +1,13 @@
+--- linux/mm/mremap.c.orig	2004-01-05 17:01:21.382104120 +0000
++++ linux/mm/mremap.c	2004-01-05 17:15:25.689749848 +0000
+@@ -315,6 +315,10 @@
+ 	old_len = PAGE_ALIGN(old_len);
+ 	new_len = PAGE_ALIGN(new_len);
+ 
++	/* Don't allow the degenerate cases */
++	if (!(old_len | new_len))
++		goto out;
++
+ 	/* new_addr is only valid if MREMAP_FIXED is specified */
+ 	if (flags & MREMAP_FIXED) {
+ 		if (new_addr & ~PAGE_MASK)
diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.rtc_fix.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.rtc_fix.patch
new file mode 100644
index 000000000000..76a663c6e89d
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.rtc_fix.patch
@@ -0,0 +1,180 @@
+diff -urN linux-2.4.23/arch/cris/drivers/ds1302.c linux-2.4.24/arch/cris/drivers/ds1302.c
+--- linux-2.4.23/arch/cris/drivers/ds1302.c	2003-08-25 04:44:39.000000000 -0700
++++ linux-2.4.24/arch/cris/drivers/ds1302.c	2004-01-05 05:53:56.000000000 -0800
+@@ -346,6 +346,7 @@
+ 		{
+ 			struct rtc_time rtc_tm;
+ 						
++			memset(&rtc_tm, 0, sizeof (struct rtc_time));
+ 			get_rtc_time(&rtc_tm);						
+ 			if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
+ 				return -EFAULT;	
+diff -urN linux-2.4.23/arch/cris/drivers/pcf8563.c linux-2.4.24/arch/cris/drivers/pcf8563.c
+--- linux-2.4.23/arch/cris/drivers/pcf8563.c	2003-08-25 04:44:39.000000000 -0700
++++ linux-2.4.24/arch/cris/drivers/pcf8563.c	2004-01-05 05:53:56.000000000 -0800
+@@ -220,6 +220,7 @@
+ 		{
+ 			struct rtc_time tm;
+ 
++			memset(&tm, 0, sizeof (struct rtc_time));
+ 			get_rtc_time(&tm);
+ 
+ 			if (copy_to_user((struct rtc_time *) arg, &tm, sizeof tm)) {
+diff -urN linux-2.4.23/arch/m68k/bvme6000/rtc.c linux-2.4.24/arch/m68k/bvme6000/rtc.c
+--- linux-2.4.23/arch/m68k/bvme6000/rtc.c	2003-06-13 07:51:31.000000000 -0700
++++ linux-2.4.24/arch/m68k/bvme6000/rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -54,6 +54,7 @@
+ 		/* Ensure clock and real-time-mode-register are accessible */
+ 		msr = rtc->msr & 0xc0;
+ 		rtc->msr = 0x40;
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		do {
+ 			wtime.tm_sec =  BCD2BIN(rtc->bcd_sec);
+ 			wtime.tm_min =  BCD2BIN(rtc->bcd_min);
+diff -urN linux-2.4.23/arch/m68k/mvme16x/rtc.c linux-2.4.24/arch/m68k/mvme16x/rtc.c
+--- linux-2.4.23/arch/m68k/mvme16x/rtc.c	2003-06-13 07:51:31.000000000 -0700
++++ linux-2.4.24/arch/m68k/mvme16x/rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -52,6 +52,7 @@
+ 		cli();
+ 		/* Ensure clock and real-time-mode-register are accessible */
+ 		rtc->ctrl = RTC_READ;
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		wtime.tm_sec =  BCD2BIN(rtc->bcd_sec);
+ 		wtime.tm_min =  BCD2BIN(rtc->bcd_min);
+ 		wtime.tm_hour = BCD2BIN(rtc->bcd_hr);
+diff -urN linux-2.4.23/arch/ppc64/kernel/rtc.c linux-2.4.24/arch/ppc64/kernel/rtc.c
+--- linux-2.4.23/arch/ppc64/kernel/rtc.c	2003-06-13 07:51:32.000000000 -0700
++++ linux-2.4.24/arch/ppc64/kernel/rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -96,6 +96,7 @@
+ 	switch (cmd) {
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
+ 	{
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		ppc_md.get_rtc_time(&wtime);
+ 		break;
+ 	}
+diff -urN linux-2.4.23/drivers/acorn/char/i2c.c linux-2.4.24/drivers/acorn/char/i2c.c
+--- linux-2.4.23/drivers/acorn/char/i2c.c	2003-08-25 04:44:40.000000000 -0700
++++ linux-2.4.24/drivers/acorn/char/i2c.c	2004-01-05 05:53:56.000000000 -0800
+@@ -166,6 +166,7 @@
+ 		break;
+ 
+ 	case RTC_RD_TIME:
++		memset(&rtctm, 0, sizeof(struct rtc_time));
+ 		get_rtc_time(&rtc_raw, &year);
+ 		rtctm.tm_sec  = rtc_raw.secs;
+ 		rtctm.tm_min  = rtc_raw.mins;
+diff -urN linux-2.4.23/drivers/char/ds1286.c linux-2.4.24/drivers/char/ds1286.c
+--- linux-2.4.23/drivers/char/ds1286.c	2003-08-25 04:44:41.000000000 -0700
++++ linux-2.4.24/drivers/char/ds1286.c	2004-01-05 05:53:56.000000000 -0800
+@@ -173,7 +173,7 @@
+ 		 * means "don't care" or "match all". Only the tm_hour,
+ 		 * tm_min, and tm_sec values are filled in.
+ 		 */
+-
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		ds1286_get_alm_time(&wtime);
+ 		break;
+ 	}
+@@ -216,6 +216,7 @@
+ 	}
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
+ 	{
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		ds1286_get_time(&wtime);
+ 		break;
+ 	}
+diff -urN linux-2.4.23/drivers/char/efirtc.c linux-2.4.24/drivers/char/efirtc.c
+--- linux-2.4.23/drivers/char/efirtc.c	2003-06-13 07:51:32.000000000 -0700
++++ linux-2.4.24/drivers/char/efirtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -118,6 +118,7 @@
+ static void
+ convert_from_efi_time(efi_time_t *eft, struct rtc_time *wtime)
+ {
++	memset(wtime, 0, sizeof(struct rtc_time));
+ 	wtime->tm_sec  = eft->second;
+ 	wtime->tm_min  = eft->minute;
+ 	wtime->tm_hour = eft->hour;
+diff -urN linux-2.4.23/drivers/char/ip27-rtc.c linux-2.4.24/drivers/char/ip27-rtc.c
+--- linux-2.4.23/drivers/char/ip27-rtc.c	2003-08-25 04:44:41.000000000 -0700
++++ linux-2.4.24/drivers/char/ip27-rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -83,6 +83,7 @@
+ 	switch (cmd) {
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
+ 	{
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		get_rtc_time(&wtime);
+ 		break;
+ 	}
+diff -urN linux-2.4.23/drivers/char/mips_rtc.c linux-2.4.24/drivers/char/mips_rtc.c
+--- linux-2.4.23/drivers/char/mips_rtc.c	2003-08-25 04:44:41.000000000 -0700
++++ linux-2.4.24/drivers/char/mips_rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -82,6 +82,7 @@
+ 
+ 	switch (cmd) {
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC  */
++		memset(&rtc_tm, 0, sizeof(struct rtc_time));
+ 		curr_time = rtc_get_time();
+ 		to_tm(curr_time, &rtc_tm);
+ 		rtc_tm.tm_year -= 1900;
+diff -urN linux-2.4.23/drivers/char/rtc.c linux-2.4.24/drivers/char/rtc.c
+--- linux-2.4.23/drivers/char/rtc.c	2003-11-28 10:26:20.000000000 -0800
++++ linux-2.4.24/drivers/char/rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -362,7 +362,7 @@
+ 		 * means "don't care" or "match all". Only the tm_hour,
+ 		 * tm_min, and tm_sec values are filled in.
+ 		 */
+-
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		get_rtc_alm_time(&wtime);
+ 		break; 
+ 	}
+@@ -406,6 +406,7 @@
+ 	}
+ 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
+ 	{
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		get_rtc_time(&wtime);
+ 		break;
+ 	}
+diff -urN linux-2.4.23/drivers/hil/hp_sdc_rtc.c linux-2.4.24/drivers/hil/hp_sdc_rtc.c
+--- linux-2.4.23/drivers/hil/hp_sdc_rtc.c	2003-06-13 07:51:33.000000000 -0700
++++ linux-2.4.24/drivers/hil/hp_sdc_rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -561,6 +561,7 @@
+         }
+         case RTC_ALM_READ:      /* Read the present alarm time */
+         {
++		memset(&ttime, 0, sizeof(struct timeval));
+ 		if (hp_sdc_rtc_read_mt(&ttime)) return -EFAULT;
+                 break;
+         }
+@@ -609,6 +610,7 @@
+         }
+         case RTC_RD_TIME:       /* Read the time/date from RTC  */
+         {
++		memset(&wtime, 0, sizeof(struct rtc_time));
+ 		if (hp_sdc_rtc_read_bbrtc(&wtime)) return -EFAULT;
+                 break;
+         }
+diff -urN linux-2.4.23/drivers/macintosh/rtc.c linux-2.4.24/drivers/macintosh/rtc.c
+--- linux-2.4.23/drivers/macintosh/rtc.c	2002-02-25 11:37:58.000000000 -0800
++++ linux-2.4.24/drivers/macintosh/rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -64,6 +64,7 @@
+ 	case RTC_RD_TIME:
+ 		if (ppc_md.get_rtc_time)
+ 		{
++			memset(&rtc_tm, 0, sizeof(struct rtc_time));
+ 			get_rtc_time(&rtc_tm);
+ 
+ 			if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
+diff -urN linux-2.4.23/drivers/sbus/char/rtc.c linux-2.4.24/drivers/sbus/char/rtc.c
+--- linux-2.4.23/drivers/sbus/char/rtc.c	2001-10-10 23:42:47.000000000 -0700
++++ linux-2.4.24/drivers/sbus/char/rtc.c	2004-01-05 05:53:56.000000000 -0800
+@@ -89,6 +89,7 @@
+ 	switch (cmd)
+ 	{
+ 	case RTCGET:
++		memset(&rtc_tm, 0, sizeof(struct rtc_time));
+ 		get_rtc_time(&rtc_tm);
+ 
+ 		if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.CAN-2003-0985.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.CAN-2003-0985.patch
new file mode 100644
index 000000000000..eb1c9d26b3d5
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.CAN-2003-0985.patch
@@ -0,0 +1,13 @@
+--- linux/mm/mremap.c.orig	2004-01-05 17:01:21.382104120 +0000
++++ linux/mm/mremap.c	2004-01-05 17:15:25.689749848 +0000
+@@ -270,6 +270,10 @@
+ 	old_len = PAGE_ALIGN(old_len);
+ 	new_len = PAGE_ALIGN(new_len);
+ 
++	/* Don't allow the degenerate cases */
++	if (!(old_len | new_len))
++		goto out;
++
+ 	/* new_addr is only valid if MREMAP_FIXED is specified */
+ 	if (flags & MREMAP_FIXED) {
+ 		if (new_addr & ~PAGE_MASK)
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.4.20-r1.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.4.20-r1.ebuild
deleted file mode 100644
index 4fccfec74073..000000000000
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.4.20-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.20-r1.ebuild,v 1.8 2003/12/02 00:36:23 iggy Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-
-inherit kernel
-
-OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
-EXTRAVERSION="-${PN/-*/}"
-[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
-KV="${OKV}${EXTRAVERSION}"
-
-S=${WORKDIR}/linux-${KV}
-
-#add one of these in if this is for a pre or rc kernel
-#KERN_PATCH="patch-2.4.20-rc1.bz2"
-
-DESCRIPTION="Full sources for the linux kernel with win4lin support"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 https://www.netraverse.com/member/downloads/files/mki-adapter.patch
-	 https://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch"
-
-KEYWORDS="x86"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-
-	cd linux-${KV}
-
-	cat ${DISTDIR}/mki-adapter.patch|patch -p1 || die "-mki-adapter patch failed"
-	cat ${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch|patch -p1 || die "-Win4Lin3 patch failed"
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.4.22.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.4.22-r1.ebuild
index 42b3f2bce595..d7c55c36b012 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.4.22.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.4.22-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.22.ebuild,v 1.4 2003/12/02 00:36:23 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.22-r1.ebuild,v 1.1 2004/01/06 21:48:33 plasmaroo Exp $
 
 IUSE="build"
 
@@ -34,7 +34,9 @@ src_unpack() {
 	cd linux-${KV}
 	cat ${DISTDIR}/mki-adapter.patch | patch -p1 &> /dev/null || die "Error: mki-adapter patch failed!"
 
-	epatch ${FILESDIR}/do_brk_fix.patch || die "failed to patch for do_brk vuln"
+	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
+	epatch ${FILESDIR}/${PN}-2.4.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
 
 	kernel_universal_unpack
 
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.4.23.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.4.23-r1.ebuild
index bba2cc32bd74..3b8e530ebf5a 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.4.23.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.4.23-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.23.ebuild,v 1.1 2003/12/04 22:48:47 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.23-r1.ebuild,v 1.1 2004/01/06 21:48:33 plasmaroo Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -33,6 +33,9 @@ src_unpack() {
 	cd linux-${KV}
 	patch -Np1 -i ${DISTDIR}/mki-adapter.patch >/dev/null 2>&1 || die "Error: mki-adapter patch failed!"
 
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
+	epatch ${FILESDIR}/${PN}-2.4.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
+
 	kernel_universal_unpack
 
 }
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.6.0.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.6.0-r1.ebuild
index 761b6bc7f9d1..e79f541c78cf 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.6.0.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.0.ebuild,v 1.1 2003/12/30 01:02:29 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.0-r1.ebuild,v 1.1 2004/01/06 21:48:33 plasmaroo Exp $
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 OKV=${PV}
@@ -35,14 +35,15 @@ src_unpack() {
 	unpack linux-${OKV}.tar.bz2
 
 	cd ${S}
-	
+
 	epatch ${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch || die "Error: Failed to appky Win4Lin3 patch!"
 	ebegin "Applying mki-adapter26_1_3_3.patch"
 	patch -Np1 -i ${DISTDIR}/mki-adapter26_1_3_3.patch > /dev/null 2>&1 || die "Error: Failed to apply mki-adapter patch!"
 	eend $?
 
-	unset ARCH
+	epatch ${FILESDIR}/${PN}-2.6.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
 
+	unset ARCH
 	# Sometimes we have icky kernel symbols; this seems to get rid of them
 	make mrproper || die