removed - not maintained

11 files changed, 0 insertions, 954 deletions

diff --git a/sys-kernel/vserver-sources/ChangeLog b/sys-kernel/vserver-sources/ChangeLog
deleted file mode 100644
index 657ac00d1fc6..000000000000
--- a/sys-kernel/vserver-sources/ChangeLog
+++ /dev/null
@@ -1,84 +0,0 @@
-# ChangeLog for sys-kernel/vserver-sources
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.14 2004/08/10 00:42:05 plasmaroo Exp $
-
-*vserver-sources-2.4.26.1.28-r4 (10 Aug 2004)
-
-  10 Aug 2004; <plasmaroo@gentoo.org> -vserver-sources-2.4.26.1.28-r3.ebuild,
-  +vserver-sources-2.4.26.1.28-r4.ebuild,
-  +files/vserver-sources-2.4.26.1.3.9.cmdlineLeak.patch:
-  Version bump for the /proc/cmdline leak vulnerability; bug #59905.
-
-*vserver-sources-2.4.26.1.28-r3 (08 Aug 2004)
-
-  08 Aug 2004; <plasmaroo@gentoo.org> -vserver-sources-2.4.26.1.28-r2.ebuild,
-  +vserver-sources-2.4.26.1.28-r3.ebuild,
-  +files/vserver-sources-2.4.26.1.3.9.CAN-2004-0685.patch:
-  Version bump for CAN-2004-0685, bug #59769.
-
-*vserver-sources-2.4.26.1.28-r2 (05 Aug 2004)
-
-  05 Aug 2004; <plasmaroo@gentoo.org> -vserver-sources-2.4.26.1.28-r1.ebuild,
-  +vserver-sources-2.4.26.1.28-r2.ebuild:
-  Added a patch for the CAN-2004-0415 vulnerability, bug #59378.
-
-*vserver-sources-2.4.26.1.28-r1 (09 Jul 2004)
-
-  09 Jul 2004; <plasmaroo@gentoo.org> +vserver-sources-2.4.26.1.28-r1.ebuild,
-  -vserver-sources-2.4.26.1.3.9-r2.ebuild,
-  +files/vserver-sources-2.4.26.1.3.9.CAN-2004-0497.patch:
-  Downgrade to 1.28 - closes bug #56171. Patched for attribute vulnerabilities,
-  bug #56479.
-
-*vserver-sources-2.4.26.1.3.9-r2 (25 Jun 2004)
-
-  25 Jun 2004; <plasmaroo@gentoo.org> -vserver-sources-2.4.26.1.3.9-r1.ebuild,
-  +vserver-sources-2.4.26.1.3.9-r2.ebuild,
-  +files/vserver-sources-2.4.26.1.3.9.CAN-2004-0495.patch,
-  +files/vserver-sources-2.4.26.1.3.9.CAN-2004-0535.patch:
-  Security bump for the CAN-2004-0495 and CAN-2004-0535 vulnerabilities.
-
-*vserver-sources-2.4.26.1.3.9-r1 (14 Jun 2004)
-
-  14 Jun 2004; <plasmaroo@gentoo.org> +vserver-sources-2.4.26.1.3.9-r1.ebuild,
-  -vserver-sources-2.4.26.1.3.9.ebuild,
-  +files/vserver-sources-2.4.26.1.3.9.FPULockup-53804.patch:
-  Added a patch for the FPU-lockup issue; please see bug #58304 for details.
-
-*vserver-sources-2.4.26.1.3.9 (02 Jun 2004)
-
-  02 Jun 2004; <plasmaroo@gentoo.org> -vserver-sources-2.4.25.1.3.8-r2.ebuild,
-  +vserver-sources-2.4.26.1.3.9.ebuild,
-  +files/vserver-sources-2.4.26.1.3.9.CAN-2004-0394.patch:
-  Version bump; bugs #47881 and #51619.
-
-  31 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  vserver-sources-2.4.25.1.3.8-r2.ebuild:
-  Masked vserver-sources-2.4.25.1.3.8-r2.ebuild broken for ppc
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
-  vserver-sources-2.4.25.1.3.8-r2.ebuild:
-  Add inherit eutils.
-
-*vserver-sources-2.4.25.1.3.8-r2 (17 Apr 2004)
-
-  17 Apr 2004; <plasmaroo@gentoo.org>
-  +files/vserver-sources-2.4.25.1.3.8.CAN-2004-0177.patch,
-  +files/vserver-sources-2.4.25.1.3.8.CAN-2004-0178.patch,
-  -vserver-sources-2.4.25.1.3.8-r1.ebuild,
-  +vserver-sources-2.4.25.1.3.8-r2.ebuild:
-  Added patches for the CAN-2004-0177 and CAN-2004-0178 vulnerabilities.
-
-*vserver-sources-2.4.25.1.3.8-r1 (15 Apr 2004)
-
-  15 Apr 2004; <plasmaroo@gentoo.org> vserver-sources-2.4.25.1.3.8-r1.ebuild:
-  Version bump for the CAN-2004-0109 issue; bug #47881. Old versions removed.
-
-*vserver-sources-2.4.25.1.3.8 (25 Mar 2004)
-*vserver-sources-2.4.24.1.26 (25 Mar 2004)
-
-  25 Mar 2004; Michael Imhof <tantive@gentoo.org> vserver-sources-2.4.24.1.26.ebuild,
-  vserver-sources-2.4.25.1.3.8.ebuild:
-  Inital ebuilds. Submitted by Thomas Eckert <eckert.thomas@gmx.net>. Closes
-  #24619.
-
diff --git a/sys-kernel/vserver-sources/Manifest b/sys-kernel/vserver-sources/Manifest
deleted file mode 100644
index e32724d23cba..000000000000
--- a/sys-kernel/vserver-sources/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 a87edf32a624a7b7f0beca184abc4ed8 ChangeLog 3433
-MD5 2e28951b2e7aa66c534604ce01e1d2ba vserver-sources-2.4.26.1.28-r4.ebuild 2386
-MD5 c30eb9aa5de5da93ac11562c11feaf30 files/digest-vserver-sources-2.4.26.1.28-r4 213
-MD5 d4a740ae56c2049247083af387a22a85 files/vserver-sources-2.4.26.1.3.9.CAN-2004-0394.patch 350
-MD5 d1ccc2047be533c992f67270a150a210 files/vserver-sources-2.4.26.1.3.9.cmdlineLeak.patch 388
-MD5 0f66013f643c79c97fda489618a4e2fd files/vserver-sources-2.4.26.1.3.9.CAN-2004-0535.patch 476
-MD5 dc18e982f8149588a291956481885a8c files/vserver-sources-2.4.26.1.3.9.CAN-2004-0495.patch 17549
-MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/vserver-sources-2.4.26.1.3.9.CAN-2004-0497.patch 707
-MD5 60d25ff310fc6abfdce39ec9e47345af files/vserver-sources-2.4.26.1.3.9.CAN-2004-0685.patch 2809
-MD5 c9da1bc82b906f6abc648c056e7bf662 files/vserver-sources-2.4.26.1.3.9.FPULockup-53804.patch 354
diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.26.1.28-r4 b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.26.1.28-r4
deleted file mode 100644
index 13280fa53f5d..000000000000
--- a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.26.1.28-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
-MD5 10c4e817c23166b152c03746cdf85545 linux-vserver-1.28.tar.bz2 39320
-MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 linux-2.4.26-CAN-2004-0415.patch 90145
diff --git a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0394.patch b/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0394.patch
deleted file mode 100644
index 273f1a52046f..000000000000
--- a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0394.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.4.22-oM3-orig/kernel/panic.c	Tue Mar 30 15:37:18 2004
-+++ linux-2.4.22-oM3-mod/kernel/panic.c	Mon May 17 18:44:01 2004
-@@ -51,7 +51,7 @@
- 
- 	bust_spinlocks(1);
- 	va_start(args, fmt);
--	vsprintf(buf, fmt, args);
-+	vsnprintf(buf, sizeof(buf), fmt, args);
- 	va_end(args);
- 	printk(KERN_EMERG "Kernel panic: %s\n",buf);
- 	if (in_interrupt())
diff --git a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0495.patch b/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0495.patch
deleted file mode 100644
index bea80eac69a9..000000000000
--- a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0495.patch
+++ /dev/null
@@ -1,655 +0,0 @@
---- linux/net/decnet/dn_dev.c.bak	Wed Jun 16 14:42:24 2004
-+++ linux/net/decnet/dn_dev.c	Wed Jun 16 14:42:34 2004
-@@ -1070,31 +1070,39 @@ int dnet_gifconf(struct net_device *dev,
- {
- 	struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr;
- 	struct dn_ifaddr *ifa;
--	struct ifreq *ifr = (struct ifreq *)buf;
-+	char buffer[DN_IFREQ_SIZE];
-+	struct ifreq *ifr = (struct ifreq *)buffer;
-+	struct sockaddr_dn *addr = (struct sockaddr_dn *)&ifr->ifr_addr;
- 	int done = 0;
- 
- 	if ((dn_db == NULL) || ((ifa = dn_db->ifa_list) == NULL))
- 		return 0;
- 
- 	for(; ifa; ifa = ifa->ifa_next) {
--		if (!ifr) {
-+		if (!buf) {
- 			done += sizeof(DN_IFREQ_SIZE);
- 			continue;
- 		}
- 		if (len < DN_IFREQ_SIZE)
- 			return done;
--		memset(ifr, 0, DN_IFREQ_SIZE);
-+		memset(buffer, 0, DN_IFREQ_SIZE);
- 
- 		if (ifa->ifa_label)
- 			strcpy(ifr->ifr_name, ifa->ifa_label);
- 		else
- 			strcpy(ifr->ifr_name, dev->name);
- 
--		(*(struct sockaddr_dn *) &ifr->ifr_addr).sdn_family = AF_DECnet;
--		(*(struct sockaddr_dn *) &ifr->ifr_addr).sdn_add.a_len = 2;
--		(*(dn_address *)(*(struct sockaddr_dn *) &ifr->ifr_addr).sdn_add.a_addr) = ifa->ifa_local;
-+		addr->sdn_family = AF_DECnet;
-+		addr->sdn_add.a_len = 2;
-+		memcpy(addr->sdn_add.a_addr, &ifa->ifa_local,
-+			sizeof(dn_address));
- 
--		ifr = (struct ifreq *)((char *)ifr + DN_IFREQ_SIZE);
-+		if (copy_to_user(buf, buffer, DN_IFREQ_SIZE)) {
-+			done = -EFAULT;
-+			break;
-+		}
-+
-+		buf  += DN_IFREQ_SIZE;
- 		len  -= DN_IFREQ_SIZE;
- 		done += DN_IFREQ_SIZE;
- 	}
---- linux-2.4.21/drivers/net/wireless/airo.c	2003-06-13 15:51:35.000000000 +0100
-+++ linux-2.4.21/drivers/net/wireless/airo.c.plasmaroo	2004-06-24 11:09:08.260352168 +0100
-@@ -3012,19 +3012,22 @@
- 			  size_t len,
- 			  loff_t *offset )
- {
--	int i;
--	int pos;
-+	loff_t pos = *offset;
- 	struct proc_data *priv = (struct proc_data*)file->private_data;
- 
--	if( !priv->rbuffer ) return -EINVAL;
-+	if (!priv->rbuffer)
-+		return -EINVAL;
- 
--	pos = *offset;
--	for( i = 0; i+pos < priv->readlen && i < len; i++ ) {
--		if (put_user( priv->rbuffer[i+pos], buffer+i ))
--			return -EFAULT;
--	}
--	*offset += i;
--	return i;
-+	if (pos < 0)
-+		return -EINVAL;
-+	if (pos >= priv->readlen)
-+		return 0;
-+	if (len > priv->readlen - pos)
-+		len = priv->readlen - pos;
-+	if (copy_to_user(buffer, priv->rbuffer + pos, len))
-+		return -EFAULT;
-+	*offset = pos + len;
-+	return len;
- }
- 
- /*
-@@ -3036,24 +3039,24 @@
- 			   size_t len,
- 			   loff_t *offset )
- {
--	int i;
--	int pos;
-+	loff_t pos = *offset;
- 	struct proc_data *priv = (struct proc_data*)file->private_data;
- 
--	if ( !priv->wbuffer ) {
-+	if (!priv->wbuffer)
- 		return -EINVAL;
--	}
--
--	pos = *offset;
- 
--	for( i = 0; i + pos <  priv->maxwritelen &&
--		     i < len; i++ ) {
--		if (get_user( priv->wbuffer[i+pos], buffer + i ))
--			return -EFAULT;
--	}
--	if ( i+pos > priv->writelen ) priv->writelen = i+file->f_pos;
--	*offset += i;
--	return i;
-+	if (pos < 0)
-+		return -EINVAL;
-+	if (pos >= priv->maxwritelen)
-+		return 0;
-+	if (len > priv->maxwritelen - pos)
-+		len = priv->maxwritelen - pos;
-+	if (copy_from_user(priv->wbuffer + pos, buffer, len))
-+		return -EFAULT;
-+	if (pos + len > priv->writelen)
-+		priv->writelen = pos + len;
-+	*offset = pos + len;
-+	return len;
- }
- 
- static int proc_status_open( struct inode *inode, struct file *file ) {
---- linux/drivers/sound/mpu401.c.bak	Wed Jun 16 14:42:24 2004
-+++ linux/drivers/sound/mpu401.c	Wed Jun 16 14:42:34 2004
-@@ -1493,14 +1493,16 @@ static unsigned long mpu_timer_get_time(
- static int mpu_timer_ioctl(int dev, unsigned int command, caddr_t arg)
- {
- 	int midi_dev = sound_timer_devs[dev]->devlink;
-+	int *p = (int *)arg;
- 
- 	switch (command)
- 	{
- 		case SNDCTL_TMR_SOURCE:
- 			{
- 				int parm;
--	
--				parm = *(int *) arg;
-+
-+				if (get_user(parm, p))
-+					return -EFAULT;
- 				parm &= timer_caps;
- 
- 				if (parm != 0)
-@@ -1512,7 +1514,9 @@ static int mpu_timer_ioctl(int dev, unsi
- 					else if (timer_mode & TMR_MODE_SMPTE)
- 						mpu_cmd(midi_dev, 0x3d, 0);		/* Use SMPTE sync */
- 				}
--				return (*(int *) arg = timer_mode);
-+				if (put_user(timer_mode, p))
-+					return -EFAULT;
-+				return timer_mode;
- 			}
- 			break;
- 
-@@ -1537,10 +1541,13 @@ static int mpu_timer_ioctl(int dev, unsi
- 			{
- 				int val;
- 
--				val = *(int *) arg;
-+				if (get_user(val, p))
-+					return -EFAULT;
- 				if (val)
- 					set_timebase(midi_dev, val);
--				return (*(int *) arg = curr_timebase);
-+				if (put_user(curr_timebase, p))
-+					return -EFAULT;
-+				return curr_timebase;
- 			}
- 			break;
- 
-@@ -1549,7 +1556,8 @@ static int mpu_timer_ioctl(int dev, unsi
- 				int val;
- 				int ret;
- 
--				val = *(int *) arg;
-+				if (get_user(val, p))
-+					return -EFAULT;
- 
- 				if (val)
- 				{
-@@ -1564,7 +1572,9 @@ static int mpu_timer_ioctl(int dev, unsi
- 					}
- 					curr_tempo = val;
- 				}
--				return (*(int *) arg = curr_tempo);
-+				if (put_user(curr_tempo, p))
-+					return -EFAULT;
-+				return curr_tempo;
- 			}
- 			break;
- 
-@@ -1572,18 +1582,25 @@ static int mpu_timer_ioctl(int dev, unsi
- 			{
- 				int val;
- 
--				val = *(int *) arg;
-+				if (get_user(val, p))
-+					return -EFAULT;
- 				if (val != 0)		/* Can't change */
- 					return -EINVAL;
--				return (*(int *) arg = ((curr_tempo * curr_timebase) + 30) / 60);
-+				val = (curr_tempo * curr_timebase + 30) / 60;
-+				if (put_user(val, p))
-+					return -EFAULT;
-+				return val;
- 			}
- 			break;
- 
- 		case SNDCTL_SEQ_GETTIME:
--			return (*(int *) arg = curr_ticks);
-+			if (put_user(curr_ticks, p))
-+				return -EFAULT;
-+			return curr_ticks;
- 
- 		case SNDCTL_TMR_METRONOME:
--			metronome_mode = *(int *) arg;
-+			if (get_user(metronome_mode, p))
-+				return -EFAULT;
- 			setup_metronome(midi_dev);
- 			return 0;
- 
---- linux/drivers/sound/msnd.c.bak	Wed Jun 16 14:42:24 2004
-+++ linux/drivers/sound/msnd.c	Wed Jun 16 14:42:34 2004
-@@ -155,13 +155,10 @@ void msnd_fifo_make_empty(msnd_fifo *f)
- 	f->len = f->tail = f->head = 0;
- }
- 
--int msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len, int user)
-+int msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len)
- {
- 	int count = 0;
- 
--	if (f->len == f->n)
--		return 0;
--
- 	while ((count < len) && (f->len != f->n)) {
- 
- 		int nwritten;
-@@ -177,11 +174,7 @@ int msnd_fifo_write(msnd_fifo *f, const 
- 				nwritten = len - count;
- 		}
- 
--		if (user) {
--			if (copy_from_user(f->data + f->tail, buf, nwritten))
--				return -EFAULT;
--		} else
--			isa_memcpy_fromio(f->data + f->tail, (unsigned long) buf, nwritten);
-+		isa_memcpy_fromio(f->data + f->tail, (unsigned long) buf, nwritten);
- 
- 		count += nwritten;
- 		buf += nwritten;
-@@ -193,13 +186,10 @@ int msnd_fifo_write(msnd_fifo *f, const 
- 	return count;
- }
- 
--int msnd_fifo_read(msnd_fifo *f, char *buf, size_t len, int user)
-+int msnd_fifo_read(msnd_fifo *f, char *buf, size_t len)
- {
- 	int count = 0;
- 
--	if (f->len == 0)
--		return f->len;
--
- 	while ((count < len) && (f->len > 0)) {
- 
- 		int nread;
-@@ -215,11 +205,7 @@ int msnd_fifo_read(msnd_fifo *f, char *b
- 				nread = len - count;
- 		}
- 
--		if (user) {
--			if (copy_to_user(buf, f->data + f->head, nread))
--				return -EFAULT;
--		} else
--			isa_memcpy_toio((unsigned long) buf, f->data + f->head, nread);
-+		isa_memcpy_toio((unsigned long) buf, f->data + f->head, nread);
- 
- 		count += nread;
- 		buf += nread;
---- linux/drivers/sound/msnd.h.bak	Wed Jun 16 14:42:24 2004
-+++ linux/drivers/sound/msnd.h	Wed Jun 16 14:42:34 2004
-@@ -266,8 +266,8 @@ void				msnd_fifo_init(msnd_fifo *f);
- void				msnd_fifo_free(msnd_fifo *f);
- int				msnd_fifo_alloc(msnd_fifo *f, size_t n);
- void				msnd_fifo_make_empty(msnd_fifo *f);
--int				msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len, int user);
--int				msnd_fifo_read(msnd_fifo *f, char *buf, size_t len, int user);
-+int				msnd_fifo_write(msnd_fifo *f, const char *buf, size_t len);
-+int				msnd_fifo_read(msnd_fifo *f, char *buf, size_t len);
- 
- int				msnd_wait_TXDE(multisound_dev_t *dev);
- int				msnd_wait_HC0(multisound_dev_t *dev);
---- linux/drivers/sound/msnd_pinnacle.c.bak	Wed Jun 16 14:42:24 2004
-+++ linux/drivers/sound/msnd_pinnacle.c	Wed Jun 16 14:42:34 2004
-@@ -804,7 +804,7 @@ static int dev_release(struct inode *ino
- 
- static __inline__ int pack_DARQ_to_DARF(register int bank)
- {
--	register int size, n, timeout = 3;
-+	register int size, timeout = 3;
- 	register WORD wTmp;
- 	LPDAQD DAQD;
- 
-@@ -825,13 +825,10 @@ static __inline__ int pack_DARQ_to_DARF(
- 	/* Read data from the head (unprotected bank 1 access okay
-            since this is only called inside an interrupt) */
- 	outb(HPBLKSEL_1, dev.io + HP_BLKS);
--	if ((n = msnd_fifo_write(
-+	msnd_fifo_write(
- 		&dev.DARF,
- 		(char *)(dev.base + bank * DAR_BUFF_SIZE),
--		size, 0)) <= 0) {
--		outb(HPBLKSEL_0, dev.io + HP_BLKS);
--		return n;
--	}
-+		size);
- 	outb(HPBLKSEL_0, dev.io + HP_BLKS);
- 
- 	return 1;
-@@ -853,21 +850,16 @@ static __inline__ int pack_DAPF_to_DAPQ(
- 		if (protect) {
- 			/* Critical section: protect fifo in non-interrupt */
- 			spin_lock_irqsave(&dev.lock, flags);
--			if ((n = msnd_fifo_read(
-+			n = msnd_fifo_read(
- 				&dev.DAPF,
- 				(char *)(dev.base + bank_num * DAP_BUFF_SIZE),
--				DAP_BUFF_SIZE, 0)) < 0) {
--				spin_unlock_irqrestore(&dev.lock, flags);
--				return n;
--			}
-+				DAP_BUFF_SIZE);
- 			spin_unlock_irqrestore(&dev.lock, flags);
- 		} else {
--			if ((n = msnd_fifo_read(
-+			n = msnd_fifo_read(
- 				&dev.DAPF,
- 				(char *)(dev.base + bank_num * DAP_BUFF_SIZE),
--				DAP_BUFF_SIZE, 0)) < 0) {
--				return n;
--			}
-+				DAP_BUFF_SIZE);
- 		}
- 		if (!n)
- 			break;
-@@ -894,30 +886,43 @@ static __inline__ int pack_DAPF_to_DAPQ(
- static int dsp_read(char *buf, size_t len)
- {
- 	int count = len;
-+	char *page = (char *)__get_free_page(PAGE_SIZE);
-+
-+	if (!page)
-+		return -ENOMEM;
- 
- 	while (count > 0) {
--		int n;
-+		int n, k;
- 		unsigned long flags;
- 
-+		k = PAGE_SIZE;
-+		if (k > count)
-+			k = count;
-+
- 		/* Critical section: protect fifo in non-interrupt */
- 		spin_lock_irqsave(&dev.lock, flags);
--		if ((n = msnd_fifo_read(&dev.DARF, buf, count, 1)) < 0) {
--			printk(KERN_WARNING LOGNAME ": FIFO read error\n");
--			spin_unlock_irqrestore(&dev.lock, flags);
--			return n;
--		}
-+		n = msnd_fifo_read(&dev.DARF, page, k);
- 		spin_unlock_irqrestore(&dev.lock, flags);
-+		if (copy_to_user(buf, page, n)) {
-+			free_page((unsigned long)page);
-+			return -EFAULT;
-+		}
- 		buf += n;
- 		count -= n;
- 
-+		if (n == k && count)
-+			continue;
-+
- 		if (!test_bit(F_READING, &dev.flags) && dev.mode & FMODE_READ) {
- 			dev.last_recbank = -1;
- 			if (chk_send_dsp_cmd(&dev, HDEX_RECORD_START) == 0)
- 				set_bit(F_READING, &dev.flags);
- 		}
- 
--		if (dev.rec_ndelay)
-+		if (dev.rec_ndelay) {
-+			free_page((unsigned long)page);
- 			return count == len ? -EAGAIN : len - count;
-+		}
- 
- 		if (count > 0) {
- 			set_bit(F_READBLOCK, &dev.flags);
-@@ -926,41 +931,57 @@ static int dsp_read(char *buf, size_t le
- 				get_rec_delay_jiffies(DAR_BUFF_SIZE)))
- 				clear_bit(F_READING, &dev.flags);
- 			clear_bit(F_READBLOCK, &dev.flags);
--			if (signal_pending(current))
-+			if (signal_pending(current)) {
-+				free_page((unsigned long)page);
- 				return -EINTR;
-+			}
- 		}
- 	}
--
-+	free_page((unsigned long)page);
- 	return len - count;
- }
- 
- static int dsp_write(const char *buf, size_t len)
- {
- 	int count = len;
-+	char *page = (char *)__get_free_page(GFP_KERNEL);
-+
-+	if (!page)
-+		return -ENOMEM;
- 
- 	while (count > 0) {
--		int n;
-+		int n, k;
- 		unsigned long flags;
- 
-+		k = PAGE_SIZE;
-+		if (k > count)
-+			k = count;
-+
-+		if (copy_from_user(page, buf, k)) {
-+			free_page((unsigned long)page);
-+			return -EFAULT;
-+		}
-+
- 		/* Critical section: protect fifo in non-interrupt */
- 		spin_lock_irqsave(&dev.lock, flags);
--		if ((n = msnd_fifo_write(&dev.DAPF, buf, count, 1)) < 0) {
--			printk(KERN_WARNING LOGNAME ": FIFO write error\n");
--			spin_unlock_irqrestore(&dev.lock, flags);
--			return n;
--		}
-+		n = msnd_fifo_write(&dev.DAPF, page, k);
- 		spin_unlock_irqrestore(&dev.lock, flags);
- 		buf += n;
- 		count -= n;
- 
-+		if (count && n == k)
-+			continue;
-+
- 		if (!test_bit(F_WRITING, &dev.flags) && (dev.mode & FMODE_WRITE)) {
- 			dev.last_playbank = -1;
- 			if (pack_DAPF_to_DAPQ(1) > 0)
- 				set_bit(F_WRITING, &dev.flags);
- 		}
- 
--		if (dev.play_ndelay)
-+		if (dev.play_ndelay) {
-+			free_page((unsigned long)page);
- 			return count == len ? -EAGAIN : len - count;
-+		}
- 
- 		if (count > 0) {
- 			set_bit(F_WRITEBLOCK, &dev.flags);
-@@ -968,11 +989,14 @@ static int dsp_write(const char *buf, si
- 				&dev.writeblock,
- 				get_play_delay_jiffies(DAP_BUFF_SIZE));
- 			clear_bit(F_WRITEBLOCK, &dev.flags);
--			if (signal_pending(current))
-+			if (signal_pending(current)) {
-+				free_page((unsigned long)page);
- 				return -EINTR;
-+			}
- 		}
- 	}
- 
-+	free_page((unsigned long)page);
- 	return len - count;
- }
- 
---- linux/drivers/sound/pss.c.bak	Wed Jun 16 14:42:24 2004
-+++ linux/drivers/sound/pss.c	Wed Jun 16 14:42:34 2004
-@@ -450,20 +450,36 @@ static void pss_mixer_reset(pss_confdata
- 	}
- }
- 
--static void arg_to_volume_mono(unsigned int volume, int *aleft)
-+static int set_volume_mono(caddr_t p, int *aleft)
- {
- 	int left;
-+	unsigned volume;
-+	if (get_user(volume, (unsigned *)p))
-+		return -EFAULT;
- 	
--	left = volume & 0x00ff;
-+	left = volume & 0xff;
- 	if (left > 100)
- 		left = 100;
- 	*aleft = left;
-+	return 0;
- }
- 
--static void arg_to_volume_stereo(unsigned int volume, int *aleft, int *aright)
-+static int set_volume_stereo(caddr_t p, int *aleft, int *aright)
- {
--	arg_to_volume_mono(volume, aleft);
--	arg_to_volume_mono(volume >> 8, aright);
-+	int left, right;
-+	unsigned volume;
-+	if (get_user(volume, (unsigned *)p))
-+		return -EFAULT;
-+
-+	left = volume & 0xff;
-+	if (left > 100)
-+		left = 100;
-+	right = (volume >> 8) & 0xff;
-+	if (right > 100)
-+		right = 100;
-+	*aleft = left;
-+	*aright = right;
-+	return 0;
- }
- 
- static int ret_vol_mono(int left)
-@@ -510,33 +526,38 @@ static int pss_mixer_ioctl (int dev, uns
- 					return call_ad_mixer(devc, cmd, arg);
- 				else
- 				{
--					if (*(int *)arg != 0)
-+					int v;
-+					if (get_user(v, (int *)arg))
-+						return -EFAULT;
-+					if (v != 0)
- 						return -EINVAL;
- 					return 0;
- 				}
- 			case SOUND_MIXER_VOLUME:
--				arg_to_volume_stereo(*(unsigned int *)arg, &devc->mixer.volume_l,
--					&devc->mixer.volume_r); 
-+				if (set_volume_stereo(arg,
-+					&devc->mixer.volume_l,
-+					&devc->mixer.volume_r))
-+					return -EFAULT;
- 				set_master_volume(devc, devc->mixer.volume_l,
- 					devc->mixer.volume_r);
- 				return ret_vol_stereo(devc->mixer.volume_l,
- 					devc->mixer.volume_r);
- 		  
- 			case SOUND_MIXER_BASS:
--				arg_to_volume_mono(*(unsigned int *)arg,
--					&devc->mixer.bass);
-+				if (set_volume_mono(arg, &devc->mixer.bass))
-+					return -EFAULT;
- 				set_bass(devc, devc->mixer.bass);
- 				return ret_vol_mono(devc->mixer.bass);
- 		  
- 			case SOUND_MIXER_TREBLE:
--				arg_to_volume_mono(*(unsigned int *)arg,
--					&devc->mixer.treble);
-+				if (set_volume_mono(arg, &devc->mixer.treble))
-+					return -EFAULT;
- 				set_treble(devc, devc->mixer.treble);
- 				return ret_vol_mono(devc->mixer.treble);
- 		  
- 			case SOUND_MIXER_SYNTH:
--				arg_to_volume_mono(*(unsigned int *)arg,
--					&devc->mixer.synth);
-+				if (set_volume_mono(arg, &devc->mixer.synth))
-+					return -EFAULT;
- 				set_synth_volume(devc, devc->mixer.synth);
- 				return ret_vol_mono(devc->mixer.synth);
- 		  
-@@ -546,54 +567,67 @@ static int pss_mixer_ioctl (int dev, uns
- 	}
- 	else			
- 	{
-+		int val, and_mask = 0, or_mask = 0;
- 		/*
- 		 * Return parameters
- 		 */
- 		switch (cmdf)
- 		{
--
- 			case SOUND_MIXER_DEVMASK:
- 				if (call_ad_mixer(devc, cmd, arg) == -EINVAL)
--					*(int *)arg = 0; /* no mixer devices */
--				return (*(int *)arg |= SOUND_MASK_VOLUME | SOUND_MASK_BASS | SOUND_MASK_TREBLE | SOUND_MASK_SYNTH);
-+					break;
-+				and_mask = ~0;
-+				or_mask = SOUND_MASK_VOLUME | SOUND_MASK_BASS | SOUND_MASK_TREBLE | SOUND_MASK_SYNTH;
-+				break;
- 		  
- 			case SOUND_MIXER_STEREODEVS:
- 				if (call_ad_mixer(devc, cmd, arg) == -EINVAL)
--					*(int *)arg = 0; /* no stereo devices */
--				return (*(int *)arg |= SOUND_MASK_VOLUME);
-+					break;
-+				and_mask = ~0;
-+				or_mask = SOUND_MASK_VOLUME;
-+				break;
- 		  
- 			case SOUND_MIXER_RECMASK:
- 				if (devc->ad_mixer_dev != NO_WSS_MIXER)
- 					return call_ad_mixer(devc, cmd, arg);
--				else
--					return (*(int *)arg = 0); /* no record devices */
-+				break;
- 
- 			case SOUND_MIXER_CAPS:
- 				if (devc->ad_mixer_dev != NO_WSS_MIXER)
- 					return call_ad_mixer(devc, cmd, arg);
--				else
--					return (*(int *)arg = SOUND_CAP_EXCL_INPUT);
-+				or_mask = SOUND_CAP_EXCL_INPUT;
-+				break;
- 
- 			case SOUND_MIXER_RECSRC:
- 				if (devc->ad_mixer_dev != NO_WSS_MIXER)
- 					return call_ad_mixer(devc, cmd, arg);
--				else
--					return (*(int *)arg = 0); /* no record source */
-+				break;
- 
- 			case SOUND_MIXER_VOLUME:
--				return (*(int *)arg = ret_vol_stereo(devc->mixer.volume_l, devc->mixer.volume_r));
-+				or_mask =  ret_vol_stereo(devc->mixer.volume_l, devc->mixer.volume_r);
-+				break;
- 			  
- 			case SOUND_MIXER_BASS:
--				return (*(int *)arg = ret_vol_mono(devc->mixer.bass));
-+				or_mask =  ret_vol_mono(devc->mixer.bass);
-+				break;
- 			  
- 			case SOUND_MIXER_TREBLE:
--				return (*(int *)arg = ret_vol_mono(devc->mixer.treble));
-+				or_mask = ret_vol_mono(devc->mixer.treble);
-+				break;
- 			  
- 			case SOUND_MIXER_SYNTH:
--				return (*(int *)arg = ret_vol_mono(devc->mixer.synth));
-+				or_mask = ret_vol_mono(devc->mixer.synth);
-+				break;
- 			default:
- 				return -EINVAL;
- 		}
-+		if (get_user(val, (int *)arg))
-+			return -EFAULT;
-+		val &= and_mask;
-+		val |= or_mask;
-+		if (put_user(val, (int *)arg))
-+			return -EFAULT;
-+		return val;
- 	}
- }
- 
diff --git a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0497.patch b/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0497.patch
deleted file mode 100644
index 9503e9efe57b..000000000000
--- a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0497.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# ChangeSet
-#
-# fs/attr.c
-#   2004/07/03 18:28:30-03:00 marcelo@logos.cnet +1 -0
-#   Thomas Biege: Fix missing DAC check on sys_chown
-# 
-# fs/attr.c
-#   2004/07/03 19:28:29-03:00 marcelo@logos.cnet +1 -1
-#   Add missing bracket to inode_change_ok() fix
-# 
-diff -Nru a/fs/attr.c b.plasmaroo/fs/attr.c
---- a/fs/attr.c	2004-07-08 17:05:20 -07:00
-+++ b.plasmaroo/fs/attr.c	2004-07-08 17:05:20 -07:00
-@@ -35,7 +35,8 @@
- 
- 	/* Make sure caller can chgrp. */
- 	if ((ia_valid & ATTR_GID) &&
--	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid) &&
-+	    (current->fsuid != inode->i_uid ||
-+	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid)) &&
- 	    !capable(CAP_CHOWN))
- 		goto error;
- 
diff --git a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0535.patch b/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0535.patch
deleted file mode 100644
index 669fc5fd32fb..000000000000
--- a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0535.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- drivers/net/e1000/e1000_ethtool.c	2003-06-13 15:51:34.000000000 +0100
-+++ drivers/net/e1000/e1000_ethtool.c.plasmaroo	2004-06-24 11:23:32.524963976 +0100
-@@ -468,6 +468,9 @@
- 
- 		if(copy_from_user(&regs, addr, sizeof(regs)))
- 			return -EFAULT;
-+		memset(regs_buff, 0, sizeof(regs_buff));
-+		if (regs.len > E1000_REGS_LEN)
-+			regs.len = E1000_REGS_LEN;
- 		e1000_ethtool_gregs(adapter, &regs, regs_buff);
- 		if(copy_to_user(addr, &regs, sizeof(regs)))
- 			return -EFAULT;
diff --git a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0685.patch b/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0685.patch
deleted file mode 100644
index d1be834cc8a5..000000000000
--- a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0685.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-#   2004/07/26 19:14:16-03:00 mjc@redhat.com 
-#   [PATCH] USB: more sparse fixes
-#   
-#   Back in October 2003 Arnaldo commited some fixes prior to 2.6 for some leaking info to userspace in the
-#   usb drivers:
-#   http://linux.bkbits.net:8080/linux-2.6/cset@3f986b35LyBKc-OxB8G6k22oOjgYTQ
-#   
-#   The corresponding changes have not been commited to 2.4, or included in
-#   the previous sparse fixes.
-# 
-# drivers/usb/audio.c
-#   2004/07/15 08:46:52-03:00 mjc@redhat.com +4 -0
-#   USB: more sparse fixes
-# 
-# drivers/usb/brlvger.c
-#   2004/07/15 08:47:27-03:00 mjc@redhat.com +1 -0
-#   USB: more sparse fixes
-# 
-# drivers/usb/serial/io_edgeport.c
-#   2004/07/15 08:48:06-03:00 mjc@redhat.com +1 -0
-#   USB: more sparse fixes
-# 
-# drivers/usb/vicam.c
-#   2004/07/15 08:47:13-03:00 mjc@redhat.com +1 -0
-#   USB: more sparse fixes
-# 
-diff -Nru a/drivers/usb/audio.c b/drivers/usb/audio.c
---- a/drivers/usb/audio.c	2004-08-08 07:41:30 -07:00
-+++ b/drivers/usb/audio.c	2004-08-08 07:41:30 -07:00
-@@ -2141,6 +2141,8 @@
-   
- 	if (cmd == SOUND_MIXER_INFO) {
- 		mixer_info info;
-+
-+		memset(&info, 0, sizeof(info));
- 		strncpy(info.id, "USB_AUDIO", sizeof(info.id));
- 		strncpy(info.name, "USB Audio Class Driver", sizeof(info.name));
- 		info.modify_counter = ms->modcnt;
-@@ -2150,6 +2152,8 @@
- 	}
- 	if (cmd == SOUND_OLD_MIXER_INFO) {
- 		_old_mixer_info info;
-+
-+		memset(&info, 0, sizeof(info));
- 		strncpy(info.id, "USB_AUDIO", sizeof(info.id));
- 		strncpy(info.name, "USB Audio Class Driver", sizeof(info.name));
- 		if (copy_to_user((void *)arg, &info, sizeof(info)))
-diff -Nru a/drivers/usb/brlvger.c b/drivers/usb/brlvger.c
---- a/drivers/usb/brlvger.c	2004-08-08 07:41:30 -07:00
-+++ b/drivers/usb/brlvger.c	2004-08-08 07:41:30 -07:00
-@@ -743,6 +743,7 @@
- 	case BRLVGER_GET_INFO: {
- 		struct brlvger_info vi;
- 
-+		memset(&vi, 0, sizeof(vi));
- 		strncpy(vi.driver_version, DRIVER_VERSION,
- 			sizeof(vi.driver_version));
- 		vi.driver_version[sizeof(vi.driver_version)-1] = 0;
-diff -Nru a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
---- a/drivers/usb/serial/io_edgeport.c	2004-08-08 07:41:30 -07:00
-+++ b/drivers/usb/serial/io_edgeport.c	2004-08-08 07:41:30 -07:00
-@@ -1913,6 +1913,7 @@
- 
- 		case TIOCGICOUNT:
- 			cnow = edge_port->icount;
-+			memset(&icount, 0, sizeof(icount));
- 			icount.cts = cnow.cts;
- 			icount.dsr = cnow.dsr;
- 			icount.rng = cnow.rng;
-diff -Nru a/drivers/usb/vicam.c b/drivers/usb/vicam.c
---- a/drivers/usb/vicam.c	2004-08-08 07:41:30 -07:00
-+++ b/drivers/usb/vicam.c	2004-08-08 07:41:30 -07:00
-@@ -481,6 +481,7 @@
- 			struct video_capability b;
- 
- 			DBG("VIDIOCGCAP\n");
-+			memset(&b, 0, sizeof(b));
- 			strcpy(b.name, "ViCam-based Camera");
- 			b.type = VID_TYPE_CAPTURE;
- 			b.channels = 1;
diff --git a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.FPULockup-53804.patch b/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.FPULockup-53804.patch
deleted file mode 100644
index 1dd5ed87b520..000000000000
--- a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.FPULockup-53804.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.4/include/asm-i386/i387.h	2004-06-13 20:06:05.044881328 +0100
-+++ linux-2.4/include/asm-i386/i387.h	2004-06-13 20:25:42.836829736 +0100
-@@ -34,7 +34,7 @@
- 
- #define clear_fpu( tsk ) do { \
- 	if ( tsk->flags & PF_USEDFPU ) { \
--		asm volatile("fwait"); \
-+		asm volatile("fnclex ; fwait"); \
- 		tsk->flags &= ~PF_USEDFPU; \
- 		stts(); \
- 	} \
diff --git a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.cmdlineLeak.patch b/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.cmdlineLeak.patch
deleted file mode 100644
index 5f26f7f388f6..000000000000
--- a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.cmdlineLeak.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.4/fs/proc/base.c	2004-04-15 07:09:32.000000000 +0100
-+++ linux-2.4/fs/proc/base.c.plasmaroo	2004-08-09 23:30:43.869195800 +0100
-@@ -187,7 +187,7 @@ static int proc_pid_cmdline(struct task_
- 	if (mm)
- 		atomic_inc(&mm->mm_users);
- 	task_unlock(task);
--	if (mm) {
-+	if (mm && mm->arg_end) {
- 		int len = mm->arg_end - mm->arg_start;
- 		if (len > PAGE_SIZE)
- 			len = PAGE_SIZE;
diff --git a/sys-kernel/vserver-sources/vserver-sources-2.4.26.1.28-r4.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.4.26.1.28-r4.ebuild
deleted file mode 100644
index 6f475791777c..000000000000
--- a/sys-kernel/vserver-sources/vserver-sources-2.4.26.1.28-r4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.4.26.1.28-r4.ebuild,v 1.1 2004/08/10 00:42:05 plasmaroo Exp $
-
-ETYPE="sources"
-inherit kernel eutils
-OKV=2.4.26
-KV=2.4.26
-
-## idea: after the kernel-version (2.4.26) we append the vs-version (e.g. 1.3.9) to
-## get 2.4.25.1.3.9 that is globbed out here:
-VEXTRAVERSION="-vs${PV#*.*.*.}"
-EXTRAVERSION="-vs${PV#*.*.*.}-${PR}"
-
-S=${WORKDIR}/linux-${KV}
-# What's in this kernel?
-
-# INCLUDED:
-# stock 2.4.26 kernel sources (or newer)
-# devel-version of vsever-patch: 1.3.9 (or newer)
-
-DESCRIPTION="Linux kernel with DEVEL version ctx-/vserver-patch"
-SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	http://www.13thfloor.at/vserver/s_release/${VEXTRAVERSION/-vs/v}/linux-vserver-${VEXTRAVERSION/-vs/}.tar.bz2
-	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
-HOMEPAGE="http://www.kernel.org/ http://www.13thfloor.at/vserver/ http://www.linux-vserver.org/"
-
-KEYWORDS="~x86 -ppc"
-IUSE=""
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	cd ${WORKDIR}
-	mv linux-${OKV} linux-${KV}${VEXTRAVERSION}-${PR}
-
-	echo ${DISTDIR}/linux-vserver-${VEXTRAVERSION/-vs/}.tar.bz2
-	tar xvjf ${DISTDIR}/linux-vserver-${VEXTRAVERSION/-vs/}.tar.bz2 || die "Unpacking patch failed!"
-
-	cd linux-${KV}${VEXTRAVERSION}-${PR}
-	epatch ${WORKDIR}/patch-${KV}${VEXTRAVERSION}.diff
-	epatch ${FILESDIR}/${PN}-2.4.26.1.3.9.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
-	epatch ${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch || die "Failed to add the CAN-2004-0415 patch!"
-	epatch ${FILESDIR}/${PN}-2.4.26.1.3.9.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
-	epatch ${FILESDIR}/${PN}-2.4.26.1.3.9.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
-	epatch ${FILESDIR}/${PN}-2.4.26.1.3.9.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
-	epatch ${FILESDIR}/${PN}-2.4.26.1.3.9.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
-	epatch ${FILESDIR}/${PN}-2.4.26.1.3.9.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
-	epatch ${FILESDIR}/${PN}-2.4.26.1.3.9.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!"
-	kernel_universal_unpack
-}