version bump and security patches

6 files changed, 308 insertions, 9 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index bc3b00eae6ca..82d768c2f633 100644
--- a/sys-kernel/openmosix-sources/ChangeLog
+++ b/sys-kernel/openmosix-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/openmosix-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.79 2004/12/27 16:49:40 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.80 2005/01/10 17:52:15 voxus Exp $
+
+*openmosix-sources-2.4.28-r5 (10 Jan 2005)
+
+  10 Jan 2005; Konstantin Arkhipov <voxus@gentoo.org>:
+  -openmosix-sources-2.4.28-r2.ebuild,
+  openmosix-sources-2.4.28-r4.ebuild,
+  +openmosix-sources-2.4.28-r5.ebuild:
+  Security patches, closing bugs #77094 and #77025.
+  Version bump also.
 
 *openmosix-sources-2.4.28-r4 (27 Dec 2004)
 
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28-r2 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28-r5
index 555b76a5d690..8b9d38b4c188 100644
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28-r2
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.28-r5
@@ -1,4 +1,4 @@
 MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
-MD5 492b747a78cc16287c8214f6bd79a951 patch-2.4.28-om-migshm-20041206.bz2 249086
+MD5 5193aa3a5cb0a6381e416364c21d2899 patch-2.4.28-om-migshm-20050110.bz2 249044
 MD5 4b99df79dcc18b17eb41489b96ff9689 linux-2.4.27-CAN-2004-0814.patch 81529
 MD5 5bbbb2201b338ebb74f0bf650b639475 linux-2.4.27-nfs3-xdr.patch.bz2 746
diff --git a/sys-kernel/openmosix-sources/files/openmosix-sources-moxa_random.patch b/sys-kernel/openmosix-sources/files/openmosix-sources-moxa_random.patch
new file mode 100644
index 000000000000..6d633e3aeb17
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/openmosix-sources-moxa_random.patch
@@ -0,0 +1,33 @@
+diff -ur linux-2.4.28/drivers/char/moxa.c linux-2.4.28.plasmaroo/drivers/char/moxa.c
+--- linux-2.4.28/drivers/char/moxa.c	2001-10-25 21:53:47.000000000 +0100
++++ linux-2.4.28.plasmaroo/drivers/char/moxa.c	2005-01-08 02:54:49.195636192 +0000
+@@ -1771,6 +1771,8 @@
+ 		return -EFAULT;
+ 	if(dltmp.cardno < 0 || dltmp.cardno >= MAX_BOARDS)
+ 		return -EINVAL;
++	if(dltmp.len < 0 || dltmp.len > sizeof(moxaBuff))
++		return -EINVAL;
+ 
+ 	switch(cmd)
+ 	{
+@@ -2927,8 +2929,6 @@
+ 	unsigned long baseAddr;
+ 	int i;
+ 
+-	if(len > sizeof(moxaBuff))
+-		return -EINVAL;
+ 	if(copy_from_user(moxaBuff, tmp, len))
+ 		return -EFAULT;
+ 	baseAddr = moxaBaseAddr[cardno];
+diff -ur linux-2.4.28/drivers/char/random.c linux-2.4.28.plasmaroo/drivers/char/random.c
+--- linux-2.4.28/drivers/char/random.c	2004-11-17 11:54:21.000000000 +0000
++++ linux-2.4.28.plasmaroo/drivers/char/random.c	2005-01-08 02:54:49.198635736 +0000
+@@ -1787,7 +1787,7 @@
+ 			     void *oldval, size_t *oldlenp,
+ 			     void *newval, size_t newlen, void **context)
+ {
+-	int	len;
++	size_t	len;
+ 	
+ 	sysctl_poolsize = random_state->poolinfo.POOLBYTES;
+ 
diff --git a/sys-kernel/openmosix-sources/files/openmosix-sources.CAN-2004-1235.patch b/sys-kernel/openmosix-sources/files/openmosix-sources.CAN-2004-1235.patch
new file mode 100644
index 000000000000..d72d2dc8b6c7
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/openmosix-sources.CAN-2004-1235.patch
@@ -0,0 +1,247 @@
+diff -uraN linux-2.4.28-openmosix-r4/arch/mips/kernel/irixelf.c linux-2.4.28-openmosix-r5/arch/mips/kernel/irixelf.c
+--- linux-2.4.28-openmosix-r4/arch/mips/kernel/irixelf.c	2005-01-10 19:20:46.000000000 +0300
++++ linux-2.4.28-openmosix-r5/arch/mips/kernel/irixelf.c	2005-01-10 19:21:46.000000000 +0300
+@@ -130,7 +130,7 @@
+ 	end = PAGE_ALIGN(end);
+ 	if (end <= start)
+ 		return;
+-	do_brk(start, end - start);
++	do_brk_locked(start, end - start);
+ }
+ 
+ 
+@@ -379,7 +379,7 @@
+ 
+ 	/* Map the last of the bss segment */
+ 	if (last_bss > len) {
+-		do_brk(len, (last_bss - len));
++		do_brk_locked(len, (last_bss - len));
+ 	}
+ 	kfree(elf_phdata);
+ 
+@@ -567,7 +567,7 @@
+ 	unsigned long v;
+ 	struct prda *pp;
+ 
+-	v =  do_brk (PRDA_ADDRESS, PAGE_SIZE);
++	v =  do_brk_locked (PRDA_ADDRESS, PAGE_SIZE);
+ 
+ 	if (v < 0)
+ 		return;
+@@ -859,7 +859,7 @@
+ 	len = (elf_phdata->p_filesz + elf_phdata->p_vaddr+ 0xfff) & 0xfffff000;
+ 	bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
+ 	if (bss > len)
+-	  do_brk(len, bss-len);
++	  do_brk_locked(len, bss-len);
+ 	kfree(elf_phdata);
+ 	return 0;
+ }
+diff -uraN linux-2.4.28-openmosix-r4/arch/sparc64/kernel/binfmt_aout32.c linux-2.4.28-openmosix-r5/arch/sparc64/kernel/binfmt_aout32.c
+--- linux-2.4.28-openmosix-r4/arch/sparc64/kernel/binfmt_aout32.c	2005-01-10 19:20:47.000000000 +0300
++++ linux-2.4.28-openmosix-r5/arch/sparc64/kernel/binfmt_aout32.c	2005-01-10 19:21:46.000000000 +0300
+@@ -49,7 +49,7 @@
+ 	end = PAGE_ALIGN(end);
+ 	if (end <= start)
+ 		return;
+-	do_brk(start, end - start);
++	do_brk_locked(start, end - start);
+ }
+ 
+ /*
+@@ -246,10 +246,10 @@
+ 	if (N_MAGIC(ex) == NMAGIC) {
+ 		loff_t pos = fd_offset;
+ 		/* Fuck me plenty... */
+-		error = do_brk(N_TXTADDR(ex), ex.a_text);
++		error = do_brk_locked(N_TXTADDR(ex), ex.a_text);
+ 		bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
+ 			  ex.a_text, &pos);
+-		error = do_brk(N_DATADDR(ex), ex.a_data);
++		error = do_brk_locked(N_DATADDR(ex), ex.a_data);
+ 		bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex),
+ 			  ex.a_data, &pos);
+ 		goto beyond_if;
+@@ -257,7 +257,7 @@
+ 
+ 	if (N_MAGIC(ex) == OMAGIC) {
+ 		loff_t pos = fd_offset;
+-		do_brk(N_TXTADDR(ex) & PAGE_MASK,
++		do_brk_locked(N_TXTADDR(ex) & PAGE_MASK,
+ 			ex.a_text+ex.a_data + PAGE_SIZE - 1);
+ 		bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
+ 			  ex.a_text+ex.a_data, &pos);
+@@ -272,7 +272,7 @@
+ 
+ 		if (!bprm->file->f_op->mmap) {
+ 			loff_t pos = fd_offset;
+-			do_brk(0, ex.a_text+ex.a_data);
++			do_brk_locked(0, ex.a_text+ex.a_data);
+ 			bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex),
+ 				  ex.a_text+ex.a_data, &pos);
+ 			goto beyond_if;
+@@ -388,7 +388,7 @@
+ 	len = PAGE_ALIGN(ex.a_text + ex.a_data);
+ 	bss = ex.a_text + ex.a_data + ex.a_bss;
+ 	if (bss > len) {
+-		error = do_brk(start_addr + len, bss - len);
++		error = do_brk_locked(start_addr + len, bss - len);
+ 		retval = error;
+ 		if (error != start_addr + len)
+ 			goto out;
+diff -uraN linux-2.4.28-openmosix-r4/fs/binfmt_aout.c linux-2.4.28-openmosix-r5/fs/binfmt_aout.c
+--- linux-2.4.28-openmosix-r4/fs/binfmt_aout.c	2005-01-10 19:20:43.000000000 +0300
++++ linux-2.4.28-openmosix-r5/fs/binfmt_aout.c	2005-01-10 19:22:48.000000000 +0300
+@@ -48,7 +48,7 @@
+ 	start = PAGE_ALIGN(start);
+ 	end = PAGE_ALIGN(end);
+ 	if (end > start) {
+-		unsigned long addr = do_brk(start, end - start);
++		unsigned long addr = do_brk_locked(start, end - start);
+ 		if ((unsigned long) addr >= TASK_SIZE)
+ 			return addr;
+ 	}
+@@ -343,10 +343,10 @@
+ 		loff_t pos = fd_offset;
+ 		/* Fuck me plenty... */
+ 		/* <AOL></AOL> */
+-		error = do_brk(N_TXTADDR(ex), ex.a_text);
++		error = do_brk_locked(N_TXTADDR(ex), ex.a_text);
+ 		bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
+ 			  ex.a_text, &pos);
+-		error = do_brk(N_DATADDR(ex), ex.a_data);
++		error = do_brk_locked(N_DATADDR(ex), ex.a_data);
+ 		bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex),
+ 			  ex.a_data, &pos);
+ 		goto beyond_if;
+@@ -367,7 +367,7 @@
+ 		map_size = ex.a_text+ex.a_data;
+ #endif
+ 
+-		error = do_brk(text_addr & PAGE_MASK, map_size);
++		error = do_brk_locked(text_addr & PAGE_MASK, map_size);
+ 		if (error != (text_addr & PAGE_MASK)) {
+ 			send_sig(SIGKILL, current, 0);
+ 			return error;
+@@ -404,7 +404,7 @@
+ 
+ 		if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) {
+ 			loff_t pos = fd_offset;
+-			do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data);
++			do_brk_locked(N_TXTADDR(ex), ex.a_text+ex.a_data);
+ 			bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex),
+ 					ex.a_text+ex.a_data, &pos);
+ 			flush_icache_range((unsigned long) N_TXTADDR(ex),
+@@ -570,7 +570,7 @@
+ 			error_time = jiffies;
+ 		}
+ 
+-		do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss);
++		do_brk_locked(start_addr, ex.a_text + ex.a_data + ex.a_bss);
+ 		
+ 		file->f_op->read(file, (char *)start_addr,
+ 			ex.a_text + ex.a_data, &pos);
+@@ -601,7 +601,7 @@
+ 	len = PAGE_ALIGN(ex.a_text + ex.a_data);
+ 	bss = ex.a_text + ex.a_data + ex.a_bss;
+ 	if (bss > len) {
+-		error = do_brk(start_addr + len, bss - len);
++		error = do_brk_locked(start_addr + len, bss - len);
+ 		retval = error;
+ 		if (error != start_addr + len)
+ 			goto out;
+diff -uraN linux-2.4.28-openmosix-r4/fs/binfmt_elf.c linux-2.4.28-openmosix-r5/fs/binfmt_elf.c
+--- linux-2.4.28-openmosix-r4/fs/binfmt_elf.c	2005-01-10 19:20:43.000000000 +0300
++++ linux-2.4.28-openmosix-r5/fs/binfmt_elf.c	2005-01-10 19:21:46.000000000 +0300
+@@ -89,7 +89,7 @@
+ 	end = ELF_PAGEALIGN(end);
+ 	if (end <= start)
+ 		return;
+-	do_brk(start, end - start);
++	do_brk_locked(start, end - start);
+ }
+ 
+ 
+@@ -388,7 +388,7 @@
+ 
+ 	/* Map the last of the bss segment */
+ 	if (last_bss > elf_bss)
+-		do_brk(elf_bss, last_bss - elf_bss);
++		do_brk_locked(elf_bss, last_bss - elf_bss);
+ 
+ 	*interp_load_addr = load_addr;
+ 	error = ((unsigned long) interp_elf_ex->e_entry) + load_addr;
+@@ -438,7 +438,7 @@
+ 		goto out;
+ 	}
+ 
+-	do_brk(0, text_data);
++	do_brk_locked(0, text_data);
+ 	if (!interpreter->f_op || !interpreter->f_op->read)
+ 		goto out;
+ 	if (interpreter->f_op->read(interpreter, addr, text_data, &offset) < 0)
+@@ -452,7 +452,7 @@
+ 	flush_icache_range((unsigned long)addr,
+ 	                   (unsigned long)addr + text_data);
+ 
+-	do_brk(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1),
++	do_brk_locked(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1),
+ 		interp_ex->a_bss);
+ 	elf_entry = interp_ex->a_entry;
+ 
+@@ -1097,7 +1097,7 @@
+ 	len = ELF_PAGESTART(elf_phdata->p_filesz + elf_phdata->p_vaddr + ELF_MIN_ALIGN - 1);
+ 	bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
+ 	if (bss > len)
+-		do_brk(len, bss - len);
++		do_brk_locked(len, bss - len);
+ 	error = 0;
+ 
+ out_free_ph:
+diff -uraN linux-2.4.28-openmosix-r4/include/linux/mm.h linux-2.4.28-openmosix-r5/include/linux/mm.h
+--- linux-2.4.28-openmosix-r4/include/linux/mm.h	2005-01-10 19:21:21.000000000 +0300
++++ linux-2.4.28-openmosix-r5/include/linux/mm.h	2005-01-10 19:21:46.000000000 +0300
+@@ -575,6 +575,7 @@
+ extern int do_munmap(struct mm_struct *, unsigned long, size_t);
+ 
+ extern unsigned long do_brk(unsigned long, unsigned long);
++extern unsigned long do_brk_locked(unsigned long, unsigned long);
+ 
+ static inline void __vma_unlink(struct mm_struct * mm, struct vm_area_struct * vma, struct vm_area_struct * prev)
+ {
+diff -uraN linux-2.4.28-openmosix-r4/kernel/ksyms.c linux-2.4.28-openmosix-r5/kernel/ksyms.c
+--- linux-2.4.28-openmosix-r4/kernel/ksyms.c	2005-01-10 19:21:17.000000000 +0300
++++ linux-2.4.28-openmosix-r5/kernel/ksyms.c	2005-01-10 19:21:46.000000000 +0300
+@@ -88,6 +88,7 @@
+ EXPORT_SYMBOL(do_mmap_pgoff);
+ EXPORT_SYMBOL(do_munmap);
+ EXPORT_SYMBOL(do_brk);
++EXPORT_SYMBOL(do_brk_locked);
+ EXPORT_SYMBOL(exit_mm);
+ EXPORT_SYMBOL(exit_files);
+ EXPORT_SYMBOL(exit_fs);
+diff -uraN linux-2.4.28-openmosix-r4/mm/mmap.c linux-2.4.28-openmosix-r5/mm/mmap.c
+--- linux-2.4.28-openmosix-r4/mm/mmap.c	2005-01-10 19:20:43.000000000 +0300
++++ linux-2.4.28-openmosix-r5/mm/mmap.c	2005-01-10 19:21:46.000000000 +0300
+@@ -1392,6 +1392,21 @@
+ 	return addr;
+ }
+ 
++/* locking version of do_brk. */
++unsigned long do_brk_locked(unsigned long addr, unsigned long len)
++{
++	unsigned long ret;
++
++	down_write(&current->mm->mmap_sem);
++	ret = do_brk(addr, len);
++	up_write(&current->mm->mmap_sem);
++
++	return ret;
++}
++
++
++
++
+ /* Build the RB tree corresponding to the VMA list. */
+ void build_mmap_rb(struct mm_struct * mm)
+ {
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r4.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r4.ebuild
index d5f272025a48..633b0549e7fd 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r4.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r4.ebuild,v 1.1 2004/12/27 16:49:40 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r4.ebuild,v 1.2 2005/01/10 17:52:15 voxus Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -29,7 +29,7 @@ HOMEPAGE="http://www.kernel.org/
 		http://dev.gentoo.org/~voxus/om/"
 LICENSE="GPL-2"
 SLOT="${KV}"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 IUSE=""
 
 src_unpack() {
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r2.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r5.ebuild
index 281fb83e9f44..13a5c9ebcea6 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r2.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r2.ebuild,v 1.2 2004/12/09 09:57:55 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.28-r5.ebuild,v 1.1 2005/01/10 17:52:15 voxus Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
 inherit kernel eutils
 
 OKV="2.4.28"
-TIMESTAMP="20041206"
+TIMESTAMP="20050110"
 [ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
 S=${WORKDIR}/linux-${KV}
 
@@ -29,7 +29,7 @@ HOMEPAGE="http://www.kernel.org/
 		http://dev.gentoo.org/~voxus/om/"
 LICENSE="GPL-2"
 SLOT="${KV}"
-KEYWORDS="-* x86"
+KEYWORDS="-* ~x86"
 IUSE=""
 
 src_unpack() {
@@ -39,5 +39,15 @@ src_unpack() {
 	epatch ${DISTDIR}/patch-${OKV}-om-migshm-${TIMESTAMP}.bz2 || die "openMosix patch failed."
 	epatch ${FILESDIR}/${PN}-binfmt_aout.patch || die "Security patch for binfmt_aout failed."
 	epatch ${FILESDIR}/${PN}-dn_neigh.patch || ewarn "dn_neigh patch failed."
+	epatch ${FILESDIR}/${PN}-moxa_random.patch || die "Security patch for moxa and random failed."
+
+	# CAN's
+	epatch ${FILESDIR}/${PN}.CAN-2004-1016.patch || die "Patch for CAN-2004-1016 failed."
+	epatch ${FILESDIR}/${PN}.CAN-2004-1056.patch || die "Patch for CAN-2004-1056 failed."
+	epatch ${FILESDIR}/${PN}.CAN-2004-1137.patch || die "Patch for CAN-2004-1137 failed."
+	epatch ${FILESDIR}/${PN}.CAN-2004-1235.patch || die "Patch for CAN-2004-1235 failed."
+
+	epatch ${FILESDIR}/${PN}-vma.patch || "Second patch for CAN-2004-1074 failed."
+
 	kernel_universal_unpack
 }