Patched for attribute vulnerabilities, bug #56479.

4 files changed, 34 insertions, 3 deletions

diff --git a/sys-kernel/compaq-sources/ChangeLog b/sys-kernel/compaq-sources/ChangeLog
index 2980a2be6bf8..4028dfee5e43 100644
--- a/sys-kernel/compaq-sources/ChangeLog
+++ b/sys-kernel/compaq-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/compaq-sources
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/compaq-sources/ChangeLog,v 1.12 2004/06/26 15:39:51 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/compaq-sources/ChangeLog,v 1.13 2004/07/09 14:18:39 plasmaroo Exp $
+
+*compaq-sources-2.4.9.32.7-r8 (09 Jul 2004)
+
+  09 Jul 2004; <plasmaroo@gentoo.org> -compaq-sources-2.4.9.32.7-r7.ebuild,
+  +compaq-sources-2.4.9.32.7-r8.ebuild,
+  +files/compaq-sources-2.4.9.32.7.CAN-2004-0497.patch:
+  Patched for attribute vulnerabilities, bug #56479.
 
   26 Jun 2004; Jon Hood <squinky86@gentoo.org>
   compaq-sources-2.4.9.32.7-r7.ebuild:
diff --git a/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r7.ebuild b/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r8.ebuild
index 87d60dcf992a..64822a138d00 100644
--- a/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r7.ebuild
+++ b/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r8.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/compaq-sources/compaq-sources-2.4.9.32.7-r7.ebuild,v 1.3 2004/06/26 15:39:51 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/compaq-sources/compaq-sources-2.4.9.32.7-r8.ebuild,v 1.1 2004/07/09 14:18:39 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel eutils
@@ -31,7 +31,7 @@ src_unpack() {
 	local kernel_rpm="kernel-source-${KV}.alpha.rpm"
 	cd ${WORKDIR}
 
-	ebegin "Unpacking Distribution RPM..."
+	ebegin "Unpacking Distribution RPM"
 
 	# agriffis' fast+efficient rpm extraction method from
 	# the dev-lang/ccc ebuild.
@@ -60,6 +60,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}.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}/${P}.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
 	epatch ${FILESDIR}/${P}.do_brk.patch || die "Failed to patch do_brk() vulnerability!"
 	epatch ${FILESDIR}/${P}.I2C_Limits.patch || die "Failed to patch the I2C i2cdev_ioctl() kmalloc() bug!"
 	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
diff --git a/sys-kernel/compaq-sources/files/compaq-sources-2.4.9.32.7.CAN-2004-0497.patch b/sys-kernel/compaq-sources/files/compaq-sources-2.4.9.32.7.CAN-2004-0497.patch
new file mode 100644
index 000000000000..9503e9efe57b
--- /dev/null
+++ b/sys-kernel/compaq-sources/files/compaq-sources-2.4.9.32.7.CAN-2004-0497.patch
@@ -0,0 +1,23 @@
+# 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/compaq-sources/files/digest-compaq-sources-2.4.9.32.7-r7 b/sys-kernel/compaq-sources/files/digest-compaq-sources-2.4.9.32.7-r8
index 96283e409fc6..96283e409fc6 100644
--- a/sys-kernel/compaq-sources/files/digest-compaq-sources-2.4.9.32.7-r7
+++ b/sys-kernel/compaq-sources/files/digest-compaq-sources-2.4.9.32.7-r8