# ChangeLog for sys-kernel/ck-sources
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.75 2004/12/24 16:08:23 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.76 2004/12/25 15:30:23 dsd Exp $
+
+*ck-sources-2.4.28-r1 (25 Dec 2004)
+
+ 25 Dec 2004; Daniel Drake <dsd@gentoo.org>
+ -files/ck-sources-2.4.27.CAN-2004-0394.patch,
+ -files/ck-sources-2.4.27.CAN-2004-1016.patch,
+ -files/ck-sources-2.4.27.CAN-2004-1056.patch,
+ -files/ck-sources-2.4.27.CAN-2004-1137.patch,
+ -files/ck-sources-2.4.27.XDRWrapFix.patch,
+ -files/ck-sources-2.4.27.binfmt_a.out.patch,
+ -files/ck-sources-2.4.27.binfmt_elf.patch,
+ -files/ck-sources-2.4.27.cmdlineLeak.patch,
+ -files/ck-sources-2.4.27.smbfs.patch, -files/ck-sources-2.4.27.vma.patch,
+ +files/ck-sources-2.4.28.CAN-2004-1016.patch,
+ +files/ck-sources-2.4.28.CAN-2004-1056.patch,
+ +files/ck-sources-2.4.28.CAN-2004-1137.patch,
+ +files/ck-sources-2.4.28.binfmt_a.out.patch,
+ +files/ck-sources-2.4.28.cmdlineLeak.patch,
+ +files/ck-sources-2.4.28.compileFix.patch,
+ +files/ck-sources-2.4.28.vma.patch, -ck-sources-2.4.27-r5.ebuild,
+ +ck-sources-2.4.28-r1.ebuild:
+ Version bump
*ck-sources-2.4.27-r5 (24 Dec 2004)
-MD5 331a789325f845df1456803b22914cda ChangeLog 15065
+MD5 b6e2f5aa9770de9a81272db5aa39f662 ck-sources-2.4.28-r1.ebuild 1089
MD5 da6a8b2e8485d25070da95f62bcf9282 ck-sources-2.6.9-r3.ebuild 1057
+MD5 98e043bf40d524baf369f298410d7d3f ChangeLog 15990
MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
-MD5 b967709ddaad3781fd7ce2d42f591895 ck-sources-2.4.27-r5.ebuild 1379
-MD5 2b3ddb8b8b15f8da35ade38544b57857 files/ck-sources-2.4.27.XDRWrapFix.patch 1499
-MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/ck-sources-2.6.9.CAN-2004-1016.patch 2835
-MD5 4d656fa3f3a47df751c0d78b64ed8353 files/ck-sources-2.6.9.AF_UNIX.SELinux.patch 1761
-MD5 42b42f2a4f260fad2fef264b82aff2ae files/ck-sources-2.6.9.vma.patch 8952
-MD5 b0a1f80aff51d6601e8924329023b241 files/ck-sources.AF_UNIX.patch 515
-MD5 c27699e9d62f7d46213bd51f87636163 files/ck-sources-2.4.27.vma.patch 8143
-MD5 d1ccc2047be533c992f67270a150a210 files/ck-sources-2.4.27.cmdlineLeak.patch 388
-MD5 757ee1239c3f14645ccea3640d551e11 files/ck-sources-2.4.27.CAN-2004-1056.patch 11249
-MD5 001b0a631c9fc28133013a1f8f78f74c files/ck-sources-2.6.9.CAN-2004-1056.patch 8458
+MD5 6bcdd0bb63e2db559a5c6465c73a7f89 files/ck-sources-2.6.9.CAN-2004-1151.patch 1143
MD5 53fe3d26f6fc45487d69895fc07770cb files/ck-sources-2.6.9.binfmt_elf.patch 2350
-MD5 b9a94233e1457787352e5f85e3e3582d files/ck-sources-2.4.27.binfmt_a.out.patch 2009
-MD5 09e9f1cad6f2f28fe81682cbad8e3011 files/ck-sources-2.6.9.CAN-2004-1137.patch 2551
+MD5 8812f60b8d02b0b3b4c46a3311ddd851 files/ck-sources-2.6.9.smbfs.patch 2662
+MD5 001b0a631c9fc28133013a1f8f78f74c files/ck-sources-2.6.9.CAN-2004-1056.patch 8458
+MD5 8c35751caf824a9dacb02e80d6189b2e files/ck-sources-2.4.28.CAN-2004-1137.patch 1764
+MD5 b0a1f80aff51d6601e8924329023b241 files/ck-sources.AF_UNIX.patch 515
+MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/ck-sources-2.4.28.CAN-2004-1016.patch 2835
+MD5 530630d25910e6bd9376b63ea099655f files/ck-sources-2.6.9.AF_UNIX.patch 469
+MD5 42b42f2a4f260fad2fef264b82aff2ae files/ck-sources-2.6.9.vma.patch 8952
+MD5 d1ccc2047be533c992f67270a150a210 files/ck-sources-2.4.28.cmdlineLeak.patch 388
MD5 025c80544aef14ce3a49024d791c5596 files/ck-sources-2.6.9.binfmt_a.out.patch 1763
MD5 7f0579764a55a43256ce069632e0373e files/digest-ck-sources-2.6.9-r3 129
-MD5 915e8d7a0618736caa44d96968015467 files/ck-sources-2.4.27.binfmt_elf.patch 2346
+MD5 c27699e9d62f7d46213bd51f87636163 files/ck-sources-2.4.28.vma.patch 8143
+MD5 55eb417b53b98efb6e89557bbf35e51b files/digest-ck-sources-2.4.28-r1 214
+MD5 79a76d3cb0029b85d4303b0019e788a8 files/ck-sources-2.4.28.compileFix.patch 2070
+MD5 4d656fa3f3a47df751c0d78b64ed8353 files/ck-sources-2.6.9.AF_UNIX.SELinux.patch 1761
MD5 f211ff52010dfc1d94d2dcfc06636fd9 files/ck-sources-2.6.9.shmLocking.patch 1757
-MD5 8c35751caf824a9dacb02e80d6189b2e files/ck-sources-2.4.27.CAN-2004-1137.patch 1764
-MD5 8812f60b8d02b0b3b4c46a3311ddd851 files/ck-sources-2.6.9.smbfs.patch 2662
-MD5 d4a740ae56c2049247083af387a22a85 files/ck-sources-2.4.27.CAN-2004-0394.patch 350
-MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/ck-sources-2.4.27.CAN-2004-1016.patch 2835
-MD5 1e1fe7bb98c80db4644f4b7fd7dd5d32 files/ck-sources-2.4.27.smbfs.patch 3434
-MD5 6bcdd0bb63e2db559a5c6465c73a7f89 files/ck-sources-2.6.9.CAN-2004-1151.patch 1143
-MD5 530630d25910e6bd9376b63ea099655f files/ck-sources-2.6.9.AF_UNIX.patch 469
-MD5 cc2afc76adbf81038af8a5f262ed5174 files/digest-ck-sources-2.4.27-r5 214
+MD5 b9a94233e1457787352e5f85e3e3582d files/ck-sources-2.4.28.binfmt_a.out.patch 2009
+MD5 757ee1239c3f14645ccea3640d551e11 files/ck-sources-2.4.28.CAN-2004-1056.patch 11249
+MD5 09e9f1cad6f2f28fe81682cbad8e3011 files/ck-sources-2.6.9.CAN-2004-1137.patch 2551
+MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/ck-sources-2.6.9.CAN-2004-1016.patch 2835
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.27-r5.ebuild,v 1.1 2004/12/24 16:08:23 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.28-r1.ebuild,v 1.1 2004/12/25 15:30:23 dsd Exp $
ETYPE="sources"
# CKV=con kolivas release version
CKV="1"
-KEYWORDS="~x86 -ppc"
+KEYWORDS="~x86"
IUSE=""
UNIPATCH_STRICTORDER="Y"
UNIPATCH_LIST="${DISTDIR}/patch-${PV}-lck${CKV}.bz2
- ${DISTDIR}/${P}-CAN-2004-0814.patch
- ${FILESDIR}/${P}.CAN-2004-0394.patch
+ ${DISTDIR}/${PN}-2.4.27-CAN-2004-0814.patch
${FILESDIR}/${P}.cmdlineLeak.patch
- ${FILESDIR}/${P}.XDRWrapFix.patch
- ${FILESDIR}/${P}.binfmt_elf.patch
- ${FILESDIR}/${P}.smbfs.patch
- ${FILESDIR}/${PN}.AF_UNIX.patch
- ${FILESDIR}/${P}.vma.patch
${FILESDIR}/${P}.binfmt_a.out.patch
+ ${FILESDIR}/${P}.vma.patch
${FILESDIR}/${P}.CAN-2004-1016.patch
${FILESDIR}/${P}.CAN-2004-1056.patch
- ${FILESDIR}/${P}.CAN-2004-1137.patch"
-
-# Something is weird with kernel-2.eclass; sticking in vma at the start gets it applied after a.out (which is what we need)...
-# Sticking it after doesn't...
+ ${FILESDIR}/${P}.CAN-2004-1137.patch
+ ${FILESDIR}/${P}.compileFix.patch"
DESCRIPTION="Full sources for the Stock Linux kernel Con Kolivas's high performance patchset"
HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
SRC_URI="${KERNEL_URI}
http://www.plumlocosoft.com/kernel/patches/2.4/${PV}/${PV}-lck${CKV}/patch-${PV}-lck${CKV}.bz2
- http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0814.patch"
+ http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${PN}-2.4.27-CAN-2004-0814.patch"
+++ /dev/null
---- 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())
+++ /dev/null
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/08/16 14:50:04-03:00 neilb@cse.unsw.edu.au
-# [PATCH] Fixed possibly xdr parsing error if write size exceed 2^31
-#
-# xdr_argsize_check needs to cope with the possibility that the
-# pointer has wrapped and could be below buf->base.
-#
-# Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
-#
-# ### Diffstat output
-# ./fs/nfsd/nfs3xdr.c | 2 +-
-# ./include/linux/nfsd/xdr3.h | 2 +-
-# 2 files changed, 2 insertions(+), 2 deletions(-)
-#
-# fs/nfsd/nfs3xdr.c
-# 2004/08/14 00:23:06-03:00 neilb@cse.unsw.edu.au +1 -1
-# Fixed possibly xdr parsing error if write size exceed 2^31
-#
-# include/linux/nfsd/xdr3.h
-# 2004/08/15 20:48:43-03:00 neilb@cse.unsw.edu.au +1 -1
-# Fixed possibly xdr parsing error if write size exceed 2^31
-#
-diff -Nru a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
---- a/fs/nfsd/nfs3xdr.c 2004-09-06 11:20:28 -07:00
-+++ b/fs/nfsd/nfs3xdr.c 2004-09-06 11:20:28 -07:00
-@@ -273,7 +273,7 @@
- {
- struct svc_buf *buf = &rqstp->rq_argbuf;
-
-- return p - buf->base <= buf->buflen;
-+ return p >= buf->base && p <= buf->base + buf->buflen ;
- }
-
- static inline int
-diff -Nru a/include/linux/nfsd/xdr3.h b/include/linux/nfsd/xdr3.h
---- a/include/linux/nfsd/xdr3.h 2004-09-06 11:20:28 -07:00
-+++ b/include/linux/nfsd/xdr3.h 2004-09-06 11:20:28 -07:00
-@@ -41,7 +41,7 @@
- __u32 count;
- int stable;
- __u8 * data;
-- int len;
-+ __u32 len;
- };
-
- struct nfsd3_createargs {
+++ /dev/null
-diff -ur linux-2.4.27/fs/binfmt_elf.c linux-2.4.27.plasmaroo/fs/binfmt_elf.c
---- linux-2.4.27/fs/binfmt_elf.c 2004-04-14 14:05:40.000000000 +0100
-+++ linux-2.4.27.plasmaroo/fs/binfmt_elf.c 2004-11-19 21:30:26.745410824 +0000
-@@ -299,9 +299,12 @@
- goto out;
-
- retval = kernel_read(interpreter,interp_elf_ex->e_phoff,(char *)elf_phdata,size);
-- error = retval;
-- if (retval < 0)
-+ error = -EIO;
-+ if (retval != size) {
-+ if (retval < 0)
-+ error = retval;
- goto out_close;
-+ }
-
- eppnt = elf_phdata;
- for (i=0; i<interp_elf_ex->e_phnum; i++, eppnt++) {
-@@ -475,8 +478,11 @@
- goto out;
-
- retval = kernel_read(bprm->file, elf_ex.e_phoff, (char *) elf_phdata, size);
-- if (retval < 0)
-+ if (retval != size) {
-+ if (retval >= 0)
-+ retval = -EIO;
- goto out_free_ph;
-+ }
-
- files = current->files; /* Refcounted so ok */
- retval = unshare_files();
-@@ -513,7 +519,8 @@
- */
-
- retval = -ENOMEM;
-- if (elf_ppnt->p_filesz > PATH_MAX)
-+ if (elf_ppnt->p_filesz > PATH_MAX ||
-+ elf_ppnt->p_filesz == 0)
- goto out_free_file;
- elf_interpreter = (char *) kmalloc(elf_ppnt->p_filesz,
- GFP_KERNEL);
-@@ -523,8 +530,16 @@
- retval = kernel_read(bprm->file, elf_ppnt->p_offset,
- elf_interpreter,
- elf_ppnt->p_filesz);
-- if (retval < 0)
-+ if (retval != elf_ppnt->p_filesz) {
-+ if (retval >= 0)
-+ retval = -EIO;
-+ goto out_free_interp;
-+ }
-+ /* make sure path is NULL terminated */
-+ retval = -EINVAL;
-+ if (elf_interpreter[elf_ppnt->p_filesz - 1] != '\0')
- goto out_free_interp;
-+
- /* If the program interpreter is one of these two,
- * then assume an iBCS2 image. Otherwise assume
- * a native linux image.
-@@ -543,8 +558,11 @@
- if (IS_ERR(interpreter))
- goto out_free_interp;
- retval = kernel_read(interpreter, 0, bprm->buf, BINPRM_BUF_SIZE);
-- if (retval < 0)
-+ if (retval != BINPRM_BUF_SIZE) {
-+ if (retval >= 0)
-+ retval = -EIO;
- goto out_free_dentry;
-+ }
-
- /* Get the exec headers */
- interp_ex = *((struct exec *) bprm->buf);
-@@ -682,8 +700,10 @@
- }
-
- error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags);
-- if (BAD_ADDR(error))
-- continue;
-+ if (BAD_ADDR(error)) {
-+ send_sig(SIGKILL, current, 0);
-+ goto out_free_dentry;
-+ }
-
- if (!load_addr_set) {
- load_addr_set = 1;
+++ /dev/null
-diff -ur linux-2.4.27/fs/smbfs/proc.c linux-2.4.28/fs/smbfs/proc.c
---- linux-2.4.27/fs/smbfs/proc.c 2004-11-12 19:32:24.000000000 +0000
-+++ linux-2.4.28/fs/smbfs/proc.c 2004-11-19 20:18:27.000000000 +0000
-@@ -1289,10 +1289,12 @@
- data_len = WVAL(buf, 1);
-
- /* we can NOT simply trust the data_len given by the server ... */
-- if (data_len > server->packet_size - (buf+3 - server->packet)) {
-- printk(KERN_ERR "smb_proc_read: invalid data length!! "
-- "%d > %d - (%p - %p)\n",
-- data_len, server->packet_size, buf+3, server->packet);
-+ if (data_len > count ||
-+ (buf+3 - server->packet) + data_len > server->packet_size) {
-+ printk(KERN_ERR "smb_proc_read: invalid data length/offset!! "
-+ "%d > %d || (%p - %p) + %d > %d\n",
-+ data_len, count,
-+ buf+3, server->packet, data_len, server->packet_size);
- result = -EIO;
- goto out;
- }
-@@ -1378,10 +1380,12 @@
- buf = smb_base(server->packet) + data_off;
-
- /* we can NOT simply trust the info given by the server ... */
-- if (data_len > server->packet_size - (buf - server->packet)) {
-- printk(KERN_ERR "smb_proc_read: invalid data length!! "
-- "%d > %d - (%p - %p)\n",
-- data_len, server->packet_size, buf, server->packet);
-+ if (data_len > count ||
-+ (buf - server->packet) + data_len > server->packet_size) {
-+ printk(KERN_ERR "smb_proc_readX: invalid data length/offset!! "
-+ "%d > %d || (%p - %p) + %d > %d\n",
-+ data_len, count,
-+ buf, server->packet, data_len, server->packet_size);
- result = -EIO;
- goto out;
- }
-diff -ur linux-2.4.27/fs/smbfs/sock.c linux-2.4.28/fs/smbfs/sock.c
---- linux-2.4.27/fs/smbfs/sock.c 2004-11-12 19:32:24.000000000 +0000
-+++ linux-2.4.28/fs/smbfs/sock.c 2004-11-19 20:18:27.000000000 +0000
-@@ -571,7 +571,11 @@
- parm_disp, parm_offset, parm_count,
- data_disp, data_offset, data_count);
- *parm = base + parm_offset;
-+ if (*parm - inbuf + parm_tot > server->packet_size)
-+ goto out_bad_parm;
- *data = base + data_offset;
-+ if (*data - inbuf + data_tot > server->packet_size)
-+ goto out_bad_data;
- goto success;
- }
-
-@@ -591,6 +595,8 @@
- rcv_buf = smb_vmalloc(buf_len);
- if (!rcv_buf)
- goto out_no_mem;
-+ memset(rcv_buf, 0, buf_len);
-+
- *parm = rcv_buf;
- *data = rcv_buf + total_p;
- } else if (data_tot > total_d || parm_tot > total_p)
-@@ -598,8 +604,12 @@
-
- if (parm_disp + parm_count > total_p)
- goto out_bad_parm;
-+ if (parm_offset + parm_count > server->packet_size)
-+ goto out_bad_parm;
- if (data_disp + data_count > total_d)
- goto out_bad_data;
-+ if (data_offset + data_count > server->packet_size)
-+ goto out_bad_data;
- memcpy(*parm + parm_disp, base + parm_offset, parm_count);
- memcpy(*data + data_disp, base + data_offset, data_count);
-
-@@ -610,8 +620,11 @@
- * Check whether we've received all of the data. Note that
- * we use the packet totals -- total lengths might shrink!
- */
-- if (data_len >= data_tot && parm_len >= parm_tot)
-+ if (data_len >= data_tot && parm_len >= parm_tot) {
-+ data_len = data_tot;
-+ parm_len = parm_tot;
- break;
-+ }
- }
-
- /*
-@@ -625,6 +638,9 @@
- server->packet = rcv_buf;
- rcv_buf = inbuf;
- } else {
-+ if (parm_len + data_len > buf_len)
-+ goto out_data_grew;
-+
- PARANOIA("copying data, old size=%d, new size=%u\n",
- server->packet_size, buf_len);
- memcpy(inbuf, rcv_buf, parm_len + data_len);
--- /dev/null
+Fix 2.4.28-lck1 compilation on GCC 3.4
+
+- Daniel Drake <dsd@gentoo.org>
+
+--- linux-dsd/kernel/sched.c.orig 2004-12-25 15:10:27.962556608 +0000
++++ linux-dsd/kernel/sched.c 2004-12-25 15:12:10.203013696 +0000
+@@ -611,12 +611,12 @@ repeat_lock_task:
+ return success;
+ }
+
+-int wake_up_process(task_t * p)
++int fastcall wake_up_process(task_t * p)
+ {
+ return try_to_wake_up(p, 0);
+ }
+
+-void wake_up_forked_process(task_t * p)
++void fastcall wake_up_forked_process(task_t * p)
+ {
+ runqueue_t *rq;
+ preempt_disable();
+@@ -653,7 +653,7 @@ void fastcall wake_up_forked_process(tas
+ * artificially, because any timeslice recovered here
+ * was given away by the parent in the first place.)
+ */
+-void sched_exit(task_t * p)
++void fastcall sched_exit(task_t * p)
+ {
+ __cli();
+ if (p->first_time_slice) {
+@@ -1427,7 +1427,7 @@ static inline void __wake_up_common(wait
+ }
+ }
+
+-void __wake_up(wait_queue_head_t *q, unsigned int mode, int nr_exclusive)
++void fastcall __wake_up(wait_queue_head_t *q, unsigned int mode, int nr_exclusive)
+ {
+ unsigned long flags;
+
+--- linux-dsd/kernel/timer.c.orig 2004-12-25 14:56:20.000000000 +0000
++++ linux-dsd/kernel/timer.c 2004-12-25 15:14:47.145154864 +0000
+@@ -110,7 +110,7 @@ static struct list_head * run_timer_list
+
+ #define NOOF_TVECS (sizeof(tvecs) / sizeof(tvecs[0]))
+
+-static inline void init_jiffieswrap_timer(void);
++static void init_jiffieswrap_timer(void);
+
+ void init_timervecs (void)
+ {
+@@ -727,7 +727,7 @@ static void check_jiffieswrap(unsigned l
+ ^ (jiffies>>(BITS_PER_LONG-1)));
+ }
+
+-static inline void init_jiffieswrap_timer(void)
++static void init_jiffieswrap_timer(void)
+ {
+ init_timer(&jiffieswrap_timer);
+ jiffieswrap_timer.expires = jiffies + CHECK_JIFFIESWRAP_INTERVAL;
+@@ -893,7 +893,7 @@ static void process_timeout(unsigned lon
+ *
+ * In all cases the return value is guaranteed to be non-negative.
+ */
+-signed long schedule_timeout(signed long timeout)
++signed long fastcall schedule_timeout(signed long timeout)
+ {
+ struct timer_list timer;
+ unsigned long expire;
+++ /dev/null
-MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453
-MD5 8c9411ff7fe5653ea1b1680df6bc44af patch-2.4.27-lck1.bz2 382759
-MD5 b3f0e5dab41525e67ed011a73c09fc9f ck-sources-2.4.27-CAN-2004-0814.patch 82216
--- /dev/null
+MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
+MD5 bd4598c4660ddd3e2b95775d5e3cca8c patch-2.4.28-lck1.bz2 384270
+MD5 b3f0e5dab41525e67ed011a73c09fc9f ck-sources-2.4.27-CAN-2004-0814.patch 82216
projects / gentoo.git / commitdiff