Security bump for bug #75963.

diff --git a/sys-kernel/uclinux-sources/ChangeLog b/sys-kernel/uclinux-sources/ChangeLog
index 53b9981420c24348ef44d545554742e30190c28f..079489b79b0f048a19e09d525307c6b9a1c0d6c1 100644 (file)
--- a/sys-kernel/uclinux-sources/ChangeLog
+++ b/sys-kernel/uclinux-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/uclinux-sources
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.28 2005/01/09 10:59:22 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.29 2005/01/09 11:18:40 plasmaroo Exp $
+
+*uclinux-sources-2.6.7_p0-r14 (09 Jan 2005)
+
+  09 Jan 2005; <plasmaroo@gentoo.org> -uclinux-sources-2.6.7_p0-r13.ebuild,
+  +uclinux-sources-2.6.7_p0-r14.ebuild,
+  +files/uclinux-sources-2.6.75963.patch:
+  Security bump for bug #75963.
 
 *uclinux-sources-2.4.26_p0-r12 (09 Jan 2005)
 

diff --git a/sys-kernel/uclinux-sources/Manifest b/sys-kernel/uclinux-sources/Manifest
index 471253c21f69b2bb247bb74086a1e5f4bdf2ed6d..bf6387ab606a2510fed77d2be4b6eccfea35eabd 100644 (file)
--- a/sys-kernel/uclinux-sources/Manifest
+++ b/sys-kernel/uclinux-sources/Manifest
@@ -1,7 +1,7 @@
-MD5 be67997413b0247b8a85069ef0e0b362 ChangeLog 9121
+MD5 f2bded2505f7d49b37070ec3053c9141 ChangeLog 9357
+MD5 b9af557700c063b4960c6d0e88c0e06e uclinux-sources-2.6.7_p0-r14.ebuild 3558
 MD5 f3fa6c474b8727f8215534b7fc9c93ba metadata.xml 304
 MD5 01bff29b5fe2d6b7952660aae9f74fc2 uclinux-sources-2.4.26_p0-r12.ebuild 3270
-MD5 033a21b9c0b1129ae32668b371e41e8a uclinux-sources-2.6.7_p0-r13.ebuild 3469
 MD5 4d656fa3f3a47df751c0d78b64ed8353 files/uclinux-sources-2.6.AF_UNIX.SELinux.patch 1761
 MD5 757ee1239c3f14645ccea3640d551e11 files/uclinux-sources-2.4.26_p0.CAN-2004-1056.patch 11249
 MD5 385d55defaf1fd0639113ac6cd0e6681 files/uclinux-sources-2.6.brk-locked.patch 10934
@@ -22,7 +22,7 @@ MD5 6bcdd0bb63e2db559a5c6465c73a7f89 files/uclinux-sources-2.6.CAN-2004-1151.pat
 MD5 8aa9e251f67d0a96275be95e78cf93d7 files/uclinux-sources-2.4.26_p0.brk-locked.patch 9287
 MD5 09e9f1cad6f2f28fe81682cbad8e3011 files/uclinux-sources-2.6.CAN-2004-1137.patch 2551
 MD5 915e8d7a0618736caa44d96968015467 files/uclinux-sources-2.4.26_p0.binfmt_elf.patch 2346
-MD5 3f6f370e8be93508e492315860e508ac files/digest-uclinux-sources-2.6.7_p0-r13 287
+MD5 3f6f370e8be93508e492315860e508ac files/digest-uclinux-sources-2.6.7_p0-r14 287
 MD5 0f66013f643c79c97fda489618a4e2fd files/uclinux-sources-2.4.26_p0.CAN-2004-0535.patch 476
 MD5 95708646470a95668e8789cd415844ed files/uclinux-sources.CAN-2004-0497.patch 846
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/uclinux-sources-2.4.26_p0.FPULockup-53804.patch 354
@@ -36,6 +36,8 @@ MD5 8165de5e2ab6e0d3263ea35ce856fd1b files/uclinux-sources-2.6.smbfs.patch 3309
 MD5 452e04a312368605e145428c35bd0e05 files/uclinux-sources-2.6.devPtmx.patch 572
 MD5 b738cb0120a32aa92cfcfdbd564dd21f files/uclinux-sources-2.6.ProcPerms.patch 1368
 MD5 8204afea1d572b49a4a80d8da4eef0c9 files/uclinux-sources-2.6.CAN-2004-0596.patch 1033
+MD5 655251f31f0bdc85bdd0cd0280af22b7 files/uclinux-sources-2.6.75963.patch 979
+MD5 a9bf527023df8fa105cdf1eff318fde7 files/uclinux-sources-2.6.77094.patch 2830
 MD5 b0a1f80aff51d6601e8924329023b241 files/uclinux-sources.AF_UNIX.patch 515
 MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/uclinux-sources-2.6.CAN-2004-1016.patch 2835
 MD5 d1ccc2047be533c992f67270a150a210 files/uclinux-sources-2.4.26_p0.cmdlineLeak.patch 388

diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r13 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r14
similarity index 100%
rename from sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r13
rename to sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r14

diff --git a/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.75963.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.75963.patch
new file mode 100644 (file)
index 0000000..80390f1
--- /dev/null
+++ b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.75963.patch
@@ -0,0 +1,32 @@
+--- linux-2.6.10/security/dummy.c      2004-12-24 21:34:26.000000000 +0000
++++ linux-2.6.10.plasmaroo/security/dummy.c    2005-01-07 20:13:50.763073872 +0000
+@@ -74,11 +74,8 @@
+ 
+ static int dummy_capable (struct task_struct *tsk, int cap)
+ {
+-      if (cap_is_fs_cap (cap) ? tsk->fsuid == 0 : tsk->euid == 0)
+-              /* capability granted */
++      if (cap_raised (tsk->cap_effective, cap))
+               return 0;
+-
+-      /* capability denied */
+       return -EPERM;
+ }
+ 
+@@ -191,6 +188,8 @@
+ 
+       current->suid = current->euid = current->fsuid = bprm->e_uid;
+       current->sgid = current->egid = current->fsgid = bprm->e_gid;
++
++      dummy_capget(current, &current->cap_effective, &current->cap_inheritable, &current->cap_permitted);
+ }
+ 
+ static int dummy_bprm_set_security (struct linux_binprm *bprm)
+@@ -550,6 +549,7 @@
+ 
+ static int dummy_task_post_setuid (uid_t id0, uid_t id1, uid_t id2, int flags)
+ {
++      dummy_capget(current, &current->cap_effective, &current->cap_inheritable, &current->cap_permitted);
+       return 0;
+ }
+ 

diff --git a/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.77094.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.77094.patch
new file mode 100644 (file)
index 0000000..903c856
--- /dev/null
+++ b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.77094.patch
@@ -0,0 +1,77 @@
+diff -urNp linux-2.6.10/drivers/char/moxa.c linux-2.6.10-new/drivers/char/moxa.c
+--- linux-2.6.10/drivers/char/moxa.c   2005-01-07 10:51:23 -0500
++++ linux-2.6.10-new/drivers/char/moxa.c       2005-01-07 10:51:33 -0500
+@@ -1668,6 +1668,8 @@ int MoxaDriverIoctl(unsigned int cmd, un
+               return -EFAULT;
+       if(dltmp.cardno < 0 || dltmp.cardno >= MAX_BOARDS)
+               return -EINVAL;
++      if(dltmp.len < 0 || dltmp.len > sizeof(moxaBuff))
++              return -EINVAL;
+ 
+       switch(cmd)
+       {
+@@ -2822,8 +2824,6 @@ static int moxaload320b(int cardno, unsi
+       void __iomem *baseAddr;
+       int i;
+ 
+-      if(len > sizeof(moxaBuff))
+-              return -EINVAL;
+       if(copy_from_user(moxaBuff, tmp, len))
+               return -EFAULT;
+       baseAddr = moxaBaseAddr[cardno];
+diff -urNp linux-2.6.10/drivers/block/scsi_ioctl.c linux-2.6.10-new/drivers/block/scsi_ioctl.c
+--- linux-2.6.10/drivers/block/scsi_ioctl.c    2005-01-07 10:51:24 -0500
++++ linux-2.6.10-new/drivers/block/scsi_ioctl.c        2005-01-07 10:51:33 -0500
+@@ -339,7 +339,8 @@ static int sg_scsi_ioctl(struct file *fi
+                        struct gendisk *bd_disk, Scsi_Ioctl_Command __user *sic)
+ {
+       struct request *rq;
+-      int err, in_len, out_len, bytes, opcode, cmdlen;
++      unsigned int in_len, out_len, bytes, opcode, cmdlen;
++      int err;
+       char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
+ 
+       /*
+diff -urNp linux-2.6.10/drivers/char/random.c linux-2.6.10-new/drivers/char/random.c
+--- linux-2.6.10/drivers/char/random.c 2005-01-07 10:51:23 -0500
++++ linux-2.6.10-new/drivers/char/random.c     2005-01-07 10:51:33 -0500
+@@ -1912,7 +1912,7 @@ static int poolsize_strategy(ctl_table *
+                            void __user *oldval, size_t __user *oldlenp,
+                            void __user *newval, size_t newlen, void **context)
+ {
+-      int     len;
++      size_t  len;
+       
+       sysctl_poolsize = random_state->poolinfo.POOLBYTES;
+ 
+diff -urNp linux-2.6.10/mm/mmap.c linux-2.6.10-new/mm/mmap.c
+--- linux-2.6.10/mm/mmap.c     2004-12-24 22:35:00.000000000 +0100
++++ linux-2.6.10-new/mm/mmap.c 2004-12-27 16:37:47.000000000 +0100
+@@ -1360,6 +1360,13 @@ int expand_stack(struct vm_area_struct *
+               vm_unacct_memory(grow);
+               return -ENOMEM;
+       }
++      if ((vma->vm_flags & VM_LOCKED) && !capable(CAP_IPC_LOCK) &&
++                      ((vma->vm_mm->locked_vm + grow) << PAGE_SHIFT) >
++                      current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur) {
++              anon_vma_unlock(vma);
++              vm_unacct_memory(grow);
++              return -ENOMEM;
++      }
+       vma->vm_end = address;
+       vma->vm_mm->total_vm += grow;
+       if (vma->vm_flags & VM_LOCKED)
+@@ -1422,6 +1429,13 @@ int expand_stack(struct vm_area_struct *
+               vm_unacct_memory(grow);
+               return -ENOMEM;
+       }
++      if ((vma->vm_flags & VM_LOCKED) && !capable(CAP_IPC_LOCK) &&
++                      ((vma->vm_mm->locked_vm + grow) << PAGE_SHIFT) >
++                      current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur) {
++              anon_vma_unlock(vma);
++              vm_unacct_memory(grow);
++              return -ENOMEM;
++      }
+       vma->vm_start = address;
+       vma->vm_pgoff -= grow;
+       vma->vm_mm->total_vm += grow;

diff --git a/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r13.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r14.ebuild
similarity index 93%
rename from sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r13.ebuild
rename to sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r14.ebuild
index cf16545b22d79d019a129d3cdbb340a70119d18d..4e19d56c38722cc4227767774e238eea493c902a 100644 (file)
--- a/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r13.ebuild
+++ b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r13.ebuild,v 1.1 2005/01/09 10:59:22 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r14.ebuild,v 1.1 2005/01/09 11:18:40 plasmaroo Exp $
 
 IUSE=""
 
@@ -60,8 +60,9 @@ src_unpack() {
        epatch ${FILESDIR}/${PN}-2.6.CAN-2004-1056.patch || die "Failed to apply the CAN-2004-1056 patch!"
        epatch ${FILESDIR}/${PN}-2.6.CAN-2004-1137.patch || die "Failed to apply the CAN-2004-1137 patch!"
        epatch ${FILESDIR}/${PN}-2.6.CAN-2004-1151.patch || die "Failed to apply the CAN-2004-1151 patch!"
-       epatch ${FILESDIR}/${PN}.77094.patch || die "Failed to apply bug #77094 patch!"
+       epatch ${FILESDIR}/${PN}-2.6.77094.patch || die "Failed to apply bug #77094 patch!"
        epatch ${FILESDIR}/${PN}-2.6.brk-locked.patch || die "Failed to apply do_brk_locked() patch!"
+       epatch ${FILESDIR}/${PN}-2.6.75963.patch || die "Failed to apply bug #75963 patch!"
 
        set MY_ARCH=${ARCH}
        unset ARCH