Added a patch to fix a new kernel vunerability for 2.4.21, 2.4.22, and 2.4.23 and added a patch to fix a memory leak in MIPS-related RTC drivers (and the generic RTC driver, as cobalt uses this). Also removed older ebuilds lacking aforementioned patches.

7 files changed, 77 insertions, 5 deletions

diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r2 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r3
index 9e16838f5d98..9e16838f5d98 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r2
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r3
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r4 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r4
deleted file mode 100644
index d6bc27d26c18..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
-MD5 0db06b0c2fcc7cdcb9993cd0095e153e mipscvs-2.4.22-20030825.diff.bz2 132364
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r6
index 5276a20886f0..5276a20886f0 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r5
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r6
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23
deleted file mode 100644
index 36560e9f5f30..000000000000
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
-MD5 6a0568d481238976d8c4cbc208492580 mipscvs-2.4.23-20031128.diff.bz2 286782
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r2
index 4a3f52d1860d..f24578de6653 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r1
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r2
@@ -1,5 +1,5 @@
 MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
-MD5 4d28439c08a6c76e8fd1bb6355dee7c4 mipscvs-2.4.23-20031214.diff.bz2 318135
+MD5 6a0568d481238976d8c4cbc208492580 mipscvs-2.4.23-20031128.diff.bz2 286782
 MD5 2230e5482efd34a9bae1cc05cd9d3b2c xfs-2.4.23-split-only.bz2 652627
 MD5 0723db65569d1eaa5de4584e5b10fe87 xfs-2.4.23-split-kernel.bz2 11561
 MD5 879b21c543189704146d9a3ff99af3c2 xfs-2.4.23-split-acl.bz2 2290
diff --git a/sys-kernel/mips-sources/files/mremap-fix.patch b/sys-kernel/mips-sources/files/mremap-fix.patch
new file mode 100644
index 000000000000..eb1c9d26b3d5
--- /dev/null
+++ b/sys-kernel/mips-sources/files/mremap-fix.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/mips-sources/files/rtc-fixes.patch b/sys-kernel/mips-sources/files/rtc-fixes.patch
new file mode 100644
index 000000000000..78b11859fe26
--- /dev/null
+++ b/sys-kernel/mips-sources/files/rtc-fixes.patch
@@ -0,0 +1,63 @@
+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/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;
+ 	}
+