Fixed ptmx (#62524) issue (remote DoS) and a few invalid digests (hds r7 and r8)

5 files changed, 78 insertions, 19 deletions

diff --git a/sys-kernel/hardened-dev-sources/ChangeLog b/sys-kernel/hardened-dev-sources/ChangeLog
index d705c2daae68..77acd2fd4636 100644
--- a/sys-kernel/hardened-dev-sources/ChangeLog
+++ b/sys-kernel/hardened-dev-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/hardened-dev-sources
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/ChangeLog,v 1.43 2004/11/19 02:51:38 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/ChangeLog,v 1.44 2004/11/23 23:12:58 kang Exp $
+
+*hardened-dev-sources-2.6.7-r14 (23 Nov 2004)
+
+  23 Nov 2004; Guillaume Destuynder <kang@gentoo.org>
+  +files/hardened-dev-sources-2.6.7-ptmx.patch,
+  +hardened-dev-sources-2.6.7-r14.ebuild:
+  Fixed ptmx (#62524) issue (remote DoS)
+  Fixed wrong digests for hds-r7 and r8
 
 *hardened-dev-sources-2.6.7-r12 (18 Nov 2004)
 
diff --git a/sys-kernel/hardened-dev-sources/Manifest b/sys-kernel/hardened-dev-sources/Manifest
index b715f5eb3de0..a66fd3057aee 100644
--- a/sys-kernel/hardened-dev-sources/Manifest
+++ b/sys-kernel/hardened-dev-sources/Manifest
@@ -1,25 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 82fb2e488cf74ed7bdb51f1f521c1fe4 hardened-dev-sources-2.6.7-r8.ebuild 1092
-MD5 27da7aaedb8b53cb58b28a876e804428 hardened-dev-sources-2.6.7-r13.ebuild 1329
-MD5 0b8ab20736a2b68476718b12a797d7ff hardened-dev-sources-2.6.7-r10.ebuild 1163
-MD5 0eaea1ae4c425845b3b55d67317ae1f7 ChangeLog 8026
 MD5 73174f8e07b82c5df563b7196f87611c metadata.xml 299
 MD5 6ceac5877bbf8ffb6523d3d671031b73 hardened-dev-sources-2.6.7-r7.ebuild 1089
+MD5 82fb2e488cf74ed7bdb51f1f521c1fe4 hardened-dev-sources-2.6.7-r8.ebuild 1092
+MD5 0b8ab20736a2b68476718b12a797d7ff hardened-dev-sources-2.6.7-r10.ebuild 1163
+MD5 27da7aaedb8b53cb58b28a876e804428 hardened-dev-sources-2.6.7-r13.ebuild 1329
+MD5 0e872573a539414aac7b09063ee19f59 hardened-dev-sources-2.6.7-r14.ebuild 1385
+MD5 2c021d890e197d7bf02f928e9fb99181 ChangeLog 8299
+MD5 8204afea1d572b49a4a80d8da4eef0c9 files/hardened-dev-sources-2.6.7.CAN-2004-0596.patch 1033
+MD5 efbbfbed471c50333a8c2fd2f2b0b061 files/digest-hardened-dev-sources-2.6.7-r7 219
+MD5 0f763833ebbcbf0f2a8ac151454c3b29 files/digest-hardened-dev-sources-2.6.7-r8 219
 MD5 8add7d7ef69d9ff384b7d4f5a0356cc3 files/digest-hardened-dev-sources-2.6.7-r10 219
 MD5 8add7d7ef69d9ff384b7d4f5a0356cc3 files/digest-hardened-dev-sources-2.6.7-r13 219
-MD5 bc48c226344f94535c3ba2e0ce55bf24 files/hardened-dev-sources-2.6.7.CAN-2004-0816.patch 1694
-MD5 8204afea1d572b49a4a80d8da4eef0c9 files/hardened-dev-sources-2.6.7.CAN-2004-0596.patch 1033
 MD5 7e3d1d44b244b238ff3e36bfe1f05c80 files/h-d-s-2.6.7-amd64-kill-vm_force_exec32.patch 871
 MD5 d7ed23c76699efe407ec668eeba30b1e files/hardened-2.6.7-binfmt_aout.patch 983
-MD5 efbbfbed471c50333a8c2fd2f2b0b061 files/digest-hardened-dev-sources-2.6.7-r7 219
-MD5 0f763833ebbcbf0f2a8ac151454c3b29 files/digest-hardened-dev-sources-2.6.7-r8 219
 MD5 4dd5aa98c36db5a352be527634d6d9ea files/hardened-2.6.7-binfmt_elf.patch 2245
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBnV4sI9RrrOsOLvcRAuCGAJ9c70yQQeXCP+31iEi3Td3P4koUTgCfaAPg
-E/uKCOfMDW7NMECfH87n44M=
-=px6t
------END PGP SIGNATURE-----
+MD5 bc48c226344f94535c3ba2e0ce55bf24 files/hardened-dev-sources-2.6.7.CAN-2004-0816.patch 1694
+MD5 8add7d7ef69d9ff384b7d4f5a0356cc3 files/digest-hardened-dev-sources-2.6.7-r14 219
+MD5 3966432dc4fe85d30f801c37737f0e6c files/hardened-dev-sources-2.6.7-ptmx.patch 570
diff --git a/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r14 b/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r14
new file mode 100644
index 000000000000..3ac31c5a42bf
--- /dev/null
+++ b/sys-kernel/hardened-dev-sources/files/digest-hardened-dev-sources-2.6.7-r14
@@ -0,0 +1,3 @@
+MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
+MD5 ecdbe38dbae9c1b628636951658fab7a hardened-patches-2.6-7.8.tar.bz2 151973
+MD5 d289935571088e5c55b3833063a967b1 genpatches-2.6-7.46-base.tar.bz2 63281
diff --git a/sys-kernel/hardened-dev-sources/files/hardened-dev-sources-2.6.7-ptmx.patch b/sys-kernel/hardened-dev-sources/files/hardened-dev-sources-2.6.7-ptmx.patch
new file mode 100644
index 000000000000..e16cab850322
--- /dev/null
+++ b/sys-kernel/hardened-dev-sources/files/hardened-dev-sources-2.6.7-ptmx.patch
@@ -0,0 +1,20 @@
+Index: linux-2.6.5/fs/devpts/inode.c
+===================================================================
+--- linux-2.6.5.orig/fs/devpts/inode.c
++++ linux-2.6.5/fs/devpts/inode.c
+@@ -178,9 +178,13 @@ struct tty_struct *devpts_get_tty(int nu
+ {
+ 	struct dentry *dentry = get_node(number);
+ 	struct tty_struct *tty;
+-
+-	tty = (IS_ERR(dentry) || !dentry->d_inode) ? NULL :
+-			dentry->d_inode->u.generic_ip;
++	
++	tty = NULL;
++	if (!IS_ERR(dentry)) {
++		if (dentry->d_inode)
++			tty = dentry->d_inode->u.generic_ip;
++		dput(dentry);
++	}
+ 
+ 	up(&devpts_root->d_inode->i_sem);
diff --git a/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r14.ebuild b/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r14.ebuild
new file mode 100644
index 000000000000..bcfef2514e6e
--- /dev/null
+++ b/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r14.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-dev-sources/hardened-dev-sources-2.6.7-r14.ebuild,v 1.1 2004/11/23 23:12:58 kang Exp $
+
+IUSE=""
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+GPV=7.46
+GPV_SRC="mirror://gentoo/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2"
+
+HGPV=7.8
+#HGPV_SRC="mirror://gentoo/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
+HGPV_SRC="http://dev.gentoo.org/~tseng/kernel/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
+
+UNIPATCH_STRICTORDER="yes"
+UNIPATCH_EXCLUDE="1315_alpha"
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2
+		       ${DISTDIR}/genpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2
+			   ${FILESDIR}/hardened-dev-sources-2.6.7.CAN-2004-0816.patch
+			   ${FILESDIR}/h-d-s-2.6.7-amd64-kill-vm_force_exec32.patch
+			   ${FILESDIR}/hardened-2.6.7-binfmt_elf.patch
+			   ${FILESDIR}/hardened-2.6.7-binfmt_aout.patch
+			   ${FILESDIR}/hardened-dev-sources-2.6.7-ptmx.patch"
+UNIPATCH_DOCS="${WORKDIR}/patches/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}/0000_README"
+
+DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+
+SRC_URI="${KERNEL_URI} ${HGPV_SRC} ${GPV_SRC}"
+KEYWORDS="~x86 ~ppc amd64"
+
+pkg_postinst() {
+	postinst_sources
+}