Version bumps for kernel attribute vulnerabilities, bug #56479.

10 files changed, 103 insertions, 14 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index fdd32729ee5f..a65a2aecb737 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-kernel/usermode-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.39 2004/06/30 18:10:28 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.40 2004/07/09 17:29:11 plasmaroo Exp $
+
+*usermode-sources-2.6.6-r3 (09 Jul 2004)
+
+  09 Jul 2004; <plasmaroo@gentoo.org> -usermode-sources-2.4.24-r5.ebuild,
+  +usermode-sources-2.4.24-r6.ebuild, -usermode-sources-2.4.26-r2.ebuild,
+  +usermode-sources-2.4.26-r3.ebuild, -usermode-sources-2.6.6-r2.ebuild,
+  +usermode-sources-2.6.6-r3.ebuild,
+  +files/usermode-sources-2.6.6.ProcPerms.patch,
+  +files/usermode-sources.CAN-2004-0497.patch:
+  Version bumps for kernel attribute vulnerabilities, bug #56479.
 
 *usermode-sources-2.6.6-r2 (30 Jun 2004)
 
diff --git a/sys-kernel/usermode-sources/Manifest b/sys-kernel/usermode-sources/Manifest
index 154baddc0c38..40706599f173 100644
--- a/sys-kernel/usermode-sources/Manifest
+++ b/sys-kernel/usermode-sources/Manifest
@@ -1,22 +1,24 @@
-MD5 3628107752de0003dd0976ed7a570267 ChangeLog 9633
-MD5 bdc320694b696c490e79334c05a037d6 usermode-sources-2.4.26-r2.ebuild 1851
+MD5 a7110b421a9d18e16168d4623475ceb4 ChangeLog 10096
+MD5 63653f9086fd6b0e6f874703ab3e4fa7 usermode-sources-2.4.26-r3.ebuild 1951
+MD5 d829124776db01c94f6b8c247f047354 usermode-sources-2.4.24-r6.ebuild 2692
 MD5 a76f13cb946fc2720c04b189616da2de metadata.xml 159
-MD5 1fa698a8fbdf6d3d35f655ebeb329a1b usermode-sources-2.6.6-r2.ebuild 878
-MD5 e414b2e930ee6446164f0bccf16b42df usermode-sources-2.4.24-r5.ebuild 2598
+MD5 69290e33a53dee51edf184c93435f113 usermode-sources-2.6.6-r3.ebuild 955
 MD5 9c816c892d6e3d3f0b7b77d3d503ab10 files/usermode-sources-2.4.24.CAN-2004-0075.patch 634
 MD5 174438d215b70cad5ffb00ca8123c062 files/usermode-sources-2.4.24.munmap.patch 837
+MD5 2f7e35e02cfe97af5e6e49bf84614b42 files/digest-usermode-sources-2.4.24-r6 134
 MD5 02c062ec3a11a6a1498cdf0b1716c90a files/usermode-sources-2.6.6.FPULockup-53804.patch 895
-MD5 288e26eaaaf3c35f214951caa52754ab files/digest-usermode-sources-2.6.6-r2 132
 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/usermode-sources-2.4.24.CAN-2004-0427.patch 460
 MD5 147fec50180ad91b6260fc7201dcb90f files/usermode-sources-2.4.24.CAN-2004-0010.patch 6050
 MD5 dc18e982f8149588a291956481885a8c files/usermode-sources-2.4.CAN-2004-0495.patch 17549
-MD5 2f7e35e02cfe97af5e6e49bf84614b42 files/digest-usermode-sources-2.4.24-r5 134
+MD5 df8bd0d5ef39221c9dec36a99223c690 files/digest-usermode-sources-2.4.26-r3 134
 MD5 de75cfa969ed092578d9ddda6c5be334 files/usermode-sources-2.4.24.CAN-2004-0181.patch 1233
-MD5 df8bd0d5ef39221c9dec36a99223c690 files/digest-usermode-sources-2.4.26-r2 134
+MD5 288e26eaaaf3c35f214951caa52754ab files/digest-usermode-sources-2.6.6-r3 132
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/usermode-sources-2.4.24.CAN-2004-0178.patch 424
 MD5 d4a740ae56c2049247083af387a22a85 files/usermode-sources-2.4.26.CAN-2004-0394.patch 350
 MD5 39361f8d16b1fe5891aab62e92f8cd30 files/usermode-sources-2.6.IPTables-RDoS.patch 390
 MD5 0f66013f643c79c97fda489618a4e2fd files/usermode-sources-2.4.CAN-2004-0535.patch 476
+MD5 b738cb0120a32aa92cfcfdbd564dd21f files/usermode-sources-2.6.6.ProcPerms.patch 1368
+MD5 95708646470a95668e8789cd415844ed files/usermode-sources.CAN-2004-0497.patch 846
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/usermode-sources-2.4.FPULockup-53804.patch 354
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/usermode-sources-2.4.24.CAN-2004-0177.patch 384
 MD5 21f3a4f186017d925067335e24db36a1 files/usermode-sources-2.4.24.CAN-2004-0109.patch 1877
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r5 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r6
index 1afde5baa80a..1afde5baa80a 100644
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r5
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r6
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r2 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r3
index 97aed2c6379a..97aed2c6379a 100644
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r2
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r3
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r2 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r3
index 97a9c9ea6e86..97a9c9ea6e86 100644
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r2
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r3
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.6.ProcPerms.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.6.ProcPerms.patch
new file mode 100644
index 000000000000..d90b8d1815d4
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.6.ProcPerms.patch
@@ -0,0 +1,49 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/07/02 18:48:26-07:00 chrisw@osdl.org 
+#   [PATCH] check attr updates in /proc
+#   
+#   Any proc entry with default proc_file_inode_operations allow unauthorized
+#   attribute updates.  This is very dangerous for proc entries that rely
+#   solely on file permissions for open/read/write.
+#   
+#   Signed-off-by: Chris Wright <chrisw@osdl.org>
+#   Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+# 
+# fs/proc/generic.c
+#   2004/07/02 15:47:55-07:00 chrisw@osdl.org +14 -7
+#   check attr updates in /proc
+# 
+diff -Nru a/fs/proc/generic.c b/fs/proc/generic.c
+--- a/fs/proc/generic.c	2004-07-08 17:03:20 -07:00
++++ b/fs/proc/generic.c	2004-07-08 17:03:20 -07:00
+@@ -231,14 +231,21 @@
+ static int proc_notify_change(struct dentry *dentry, struct iattr *iattr)
+ {
+ 	struct inode *inode = dentry->d_inode;
+-	int error = inode_setattr(inode, iattr);
+-	if (!error) {
+-		struct proc_dir_entry *de = PDE(inode);
+-		de->uid = inode->i_uid;
+-		de->gid = inode->i_gid;
+-		de->mode = inode->i_mode;
+-	}
++	struct proc_dir_entry *de = PDE(inode);
++	int error;
+ 
++	error = inode_change_ok(inode, iattr);
++	if (error)
++		goto out;
++
++	error = inode_setattr(inode, iattr);
++	if (error)
++		goto out;
++	
++	de->uid = inode->i_uid;
++	de->gid = inode->i_gid;
++	de->mode = inode->i_mode;
++out:
+ 	return error;
+ }
+ 
diff --git a/sys-kernel/usermode-sources/files/usermode-sources.CAN-2004-0497.patch b/sys-kernel/usermode-sources/files/usermode-sources.CAN-2004-0497.patch
new file mode 100644
index 000000000000..41b3196f84ea
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/usermode-sources.CAN-2004-0497.patch
@@ -0,0 +1,26 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/07/02 20:55:04-07:00 chrisw@osdl.org 
+#   [PATCH] chown permission check fix for ATTR_GID
+#   
+#   SuSE discovered this problem with chown and ATTR_GID.  Make sure user
+#   is authorized to change the group, CAN-2004-0497.
+# 
+# fs/attr.c
+#   2004/07/02 09:07:32-07:00 chrisw@osdl.org +2 -1
+#   chown permission check fix for ATTR_GID
+# 
+diff -Nru a/fs/attr.c b/fs/attr.c
+--- a/fs/attr.c	2004-07-08 16:35:57 -07:00
++++ b/fs/attr.c	2004-07-08 16:35:57 -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/usermode-sources/usermode-sources-2.4.24-r5.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.24-r6.ebuild
index 78a685db4392..fef2a44b7c65 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.24-r5.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.4.24-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.24-r5.ebuild,v 1.1 2004/06/29 17:28:39 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.24-r6.ebuild,v 1.1 2004/07/09 17:29:11 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel eutils
@@ -40,6 +40,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.4.26.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 	epatch ${FILESDIR}/${P}.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 	kernel_universal_unpack
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.26-r2.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.26-r3.ebuild
index e3652695c957..33cd9fc48c77 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.26-r2.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.4.26-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.26-r2.ebuild,v 1.1 2004/06/29 17:28:39 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.26-r3.ebuild,v 1.1 2004/07/09 17:29:11 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel eutils
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="${PV}-${PR}"
 KEYWORDS="~x86 -ppc"
-EXTRAVERSION="-uml1"
+EXTRAVERSION="-uml1-${PR}"
 RESTRICT="nomirror"
 
 # console-tools is needed to solve the loadkeys fiasco.
@@ -32,6 +32,7 @@ src_unpack() {
 	epatch ${DISTDIR}/${UML_PATCH}.bz2
 	epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 	kernel_universal_unpack
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.6-r2.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.6-r3.ebuild
index 19fb9bd83eb7..e3b0cc789ad1 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.6.6-r2.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.6-r2.ebuild,v 1.1 2004/06/30 18:10:28 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.6-r3.ebuild,v 1.1 2004/07/09 17:29:11 plasmaroo Exp $
 
 K_NOUSENAME="yes"
 ETYPE="sources"
@@ -8,12 +8,12 @@ ETYPE="sources"
 inherit kernel-2
 UML_PATCH="uml-patch-2.6.6-1"
 OKV="${PV}"
-EXTRAVERSION="-${UML_PATCH//-*-/}"
+EXTRAVERSION="-${UML_PATCH//-*-/}-${PR}"
 KV="${OKV}${EXTRAVERSION}"
 S="${WORKDIR}/linux-${KV}"
 IUSE=""
 
-UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2 ${FILESDIR}/${P}.FPULockup-53804.patch ${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch"
+UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2 ${FILESDIR}/${PN}.CAN-2004-0497.patch ${FILESDIR}/${P}.FPULockup-53804.patch ${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch ${FILESDIR}/${P}.ProcPerms.patch"
 
 DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV}.tar.bz2