diff options
author | 2004-12-25 15:30:23 +0000 | |
---|---|---|
committer | 2004-12-25 15:30:23 +0000 | |
commit | d004e993fee305ebd9c6d5a6f1dd78882211b4d2 (patch) | |
tree | ef91bdb1ea4517e8472738515ca698d725da8308 /sys-kernel/ck-sources/files | |
parent | oops - didn't mean to commit this; reverting to rev1.6 (diff) | |
download | gentoo-2-d004e993fee305ebd9c6d5a6f1dd78882211b4d2.tar.gz gentoo-2-d004e993fee305ebd9c6d5a6f1dd78882211b4d2.tar.bz2 gentoo-2-d004e993fee305ebd9c6d5a6f1dd78882211b4d2.zip |
Version bump
Diffstat (limited to 'sys-kernel/ck-sources/files')
13 files changed, 71 insertions, 244 deletions
diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.27.CAN-2004-0394.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.27.CAN-2004-0394.patch deleted file mode 100644 index 273f1a52046f..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-2.4.27.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/ck-sources/files/ck-sources-2.4.27.XDRWrapFix.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.27.XDRWrapFix.patch deleted file mode 100644 index 9a336ab7876a..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-2.4.27.XDRWrapFix.patch +++ /dev/null @@ -1,48 +0,0 @@ -# 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 { diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.27.binfmt_elf.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.27.binfmt_elf.patch deleted file mode 100644 index 9f4f44ee78f5..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-2.4.27.binfmt_elf.patch +++ /dev/null @@ -1,85 +0,0 @@ -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; diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.27.smbfs.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.27.smbfs.patch deleted file mode 100644 index 63c5ba30403f..000000000000 --- a/sys-kernel/ck-sources/files/ck-sources-2.4.27.smbfs.patch +++ /dev/null @@ -1,97 +0,0 @@ -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); diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.27.CAN-2004-1016.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.28.CAN-2004-1016.patch index aa25ac95ed61..aa25ac95ed61 100644 --- a/sys-kernel/ck-sources/files/ck-sources-2.4.27.CAN-2004-1016.patch +++ b/sys-kernel/ck-sources/files/ck-sources-2.4.28.CAN-2004-1016.patch diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.27.CAN-2004-1056.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.28.CAN-2004-1056.patch index 53b777acaac5..53b777acaac5 100644 --- a/sys-kernel/ck-sources/files/ck-sources-2.4.27.CAN-2004-1056.patch +++ b/sys-kernel/ck-sources/files/ck-sources-2.4.28.CAN-2004-1056.patch diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.27.CAN-2004-1137.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.28.CAN-2004-1137.patch index 161806ce79d7..161806ce79d7 100644 --- a/sys-kernel/ck-sources/files/ck-sources-2.4.27.CAN-2004-1137.patch +++ b/sys-kernel/ck-sources/files/ck-sources-2.4.28.CAN-2004-1137.patch diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.27.binfmt_a.out.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.28.binfmt_a.out.patch index 4644ae28bce4..4644ae28bce4 100644 --- a/sys-kernel/ck-sources/files/ck-sources-2.4.27.binfmt_a.out.patch +++ b/sys-kernel/ck-sources/files/ck-sources-2.4.28.binfmt_a.out.patch diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.27.cmdlineLeak.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.28.cmdlineLeak.patch index 5f26f7f388f6..5f26f7f388f6 100644 --- a/sys-kernel/ck-sources/files/ck-sources-2.4.27.cmdlineLeak.patch +++ b/sys-kernel/ck-sources/files/ck-sources-2.4.28.cmdlineLeak.patch diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.28.compileFix.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.28.compileFix.patch new file mode 100644 index 000000000000..62b6bf7e7a8d --- /dev/null +++ b/sys-kernel/ck-sources/files/ck-sources-2.4.28.compileFix.patch @@ -0,0 +1,68 @@ +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; diff --git a/sys-kernel/ck-sources/files/ck-sources-2.4.27.vma.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.28.vma.patch index 2469dd5ab2c5..2469dd5ab2c5 100644 --- a/sys-kernel/ck-sources/files/ck-sources-2.4.27.vma.patch +++ b/sys-kernel/ck-sources/files/ck-sources-2.4.28.vma.patch diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.27-r5 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.27-r5 deleted file mode 100644 index e7725e697778..000000000000 --- a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.27-r5 +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.4.28-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.28-r1 new file mode 100644 index 000000000000..6ed8796c30ca --- /dev/null +++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.4.28-r1 @@ -0,0 +1,3 @@ +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 |