Break out of infinite loop from corrupt getdents structs.

Package-Manager: portage-2.1.4

4 files changed, 58 insertions, 12 deletions

diff --git a/dev-util/strace/ChangeLog b/dev-util/strace/ChangeLog
index f6a2dd5ed690..cdc67bf0e72a 100644
--- a/dev-util/strace/ChangeLog
+++ b/dev-util/strace/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/strace
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.111 2007/12/26 16:12:56 armin76 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/ChangeLog,v 1.112 2008/01/14 17:36:23 vapier Exp $
+
+  14 Jan 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/strace-4.5.16-getdents-infinite-loop.patch,
+  strace-4.5.16-r1.ebuild:
+  Break out of infinite loop from corrupt getdents structs.
 
   26 Dec 2007; Raúl Porcel <armin76@gentoo.org> strace-4.5.16-r1.ebuild:
   sparc stable wrt #197398
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 3250b4b852ce..ffa2897f7a67 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX strace-4.5.11-alpha-stat64.patch 1418 RMD160 a136a80eac15bca87fe6b2d39d65949fc2249d0a SHA1 09bfdf92442b9ac694b98c3c8710af9947f49521 SHA256 33ce8bf0b266c2741607907460686a82e23df0ac79fdb7fe5b4436d119b101de
 MD5 cbd6857cb3c5b57e1364ca621fb1a5b3 files/strace-4.5.11-alpha-stat64.patch 1418
 RMD160 a136a80eac15bca87fe6b2d39d65949fc2249d0a files/strace-4.5.11-alpha-stat64.patch 1418
@@ -38,6 +41,10 @@ AUX strace-4.5.15-sh-SYS_ipc_subcall.patch 479 RMD160 ffc4c527752a39bdbdbbcf6cc6
 MD5 9f643863b8d28034cc4619156f2d6734 files/strace-4.5.15-sh-SYS_ipc_subcall.patch 479
 RMD160 ffc4c527752a39bdbdbbcf6cc673921fe261cd67 files/strace-4.5.15-sh-SYS_ipc_subcall.patch 479
 SHA256 6d58b6946d60b54b92c2a66c7c17cffc578088ade214fdbc70d0cd3496f0aab3 files/strace-4.5.15-sh-SYS_ipc_subcall.patch 479
+AUX strace-4.5.16-getdents-infinite-loop.patch 532 RMD160 c11ee44dfe3ffec644a274d9a6987edee5f68307 SHA1 cd7b9ed62c45a9fd10681daec1b2ad5467d28ea6 SHA256 de23eaf0b19f84187576135066365abee2fda81eb78d94ca49afd4a5fb0f8e93
+MD5 60038305db652aa03acf3c7da08476ca files/strace-4.5.16-getdents-infinite-loop.patch 532
+RMD160 c11ee44dfe3ffec644a274d9a6987edee5f68307 files/strace-4.5.16-getdents-infinite-loop.patch 532
+SHA256 de23eaf0b19f84187576135066365abee2fda81eb78d94ca49afd4a5fb0f8e93 files/strace-4.5.16-getdents-infinite-loop.patch 532
 AUX strace-4.5.16-mips-syscallent.patch 1228 RMD160 5c394a686b7056c73a067f7bad5a3b364d46eb00 SHA1 3b7966c47c07670d675a9f7dd6021d300cd5e50a SHA256 759ab03adf5ff56260255733e863a9211634d8476f68ce679f70928215258c3f
 MD5 57744d5032f1ca4d485d49521cd653c5 files/strace-4.5.16-mips-syscallent.patch 1228
 RMD160 5c394a686b7056c73a067f7bad5a3b364d46eb00 files/strace-4.5.16-mips-syscallent.patch 1228
@@ -90,18 +97,18 @@ EBUILD strace-4.5.15.ebuild 1262 RMD160 f28806295cb2dff5d04b1ba9f42b50d416910249
 MD5 449eb6418d04125cd33100e6f30f86bd strace-4.5.15.ebuild 1262
 RMD160 f28806295cb2dff5d04b1ba9f42b50d416910249 strace-4.5.15.ebuild 1262
 SHA256 62fbd7ed76ed62cddaddeb861994097efb59ffea981cb25fdc6677e57b60c19d strace-4.5.15.ebuild 1262
-EBUILD strace-4.5.16-r1.ebuild 1246 RMD160 e3311275a8a03c15b7490292c623a9a2c182bb85 SHA1 d04d3d8a74d9262847f5ee3b873bbfb6d4318f1c SHA256 1a9fee0788f9340dba803c7a27433738d0ea2df34f647a69c782b7b46bb1dc92
-MD5 830630f39a31d90fe2b9e7fa66e9acb2 strace-4.5.16-r1.ebuild 1246
-RMD160 e3311275a8a03c15b7490292c623a9a2c182bb85 strace-4.5.16-r1.ebuild 1246
-SHA256 1a9fee0788f9340dba803c7a27433738d0ea2df34f647a69c782b7b46bb1dc92 strace-4.5.16-r1.ebuild 1246
+EBUILD strace-4.5.16-r1.ebuild 1301 RMD160 eb1654d089129ca6e12fd556c952c97b049e274f SHA1 b1a33815333b0d05ef6cd1a59a6203b972b17edb SHA256 d7b42b2a05c4fb795facad5a265af2b56b42762bbf70a282a6c623ec37aa72a2
+MD5 9944f96d793542215efb44223a2b8be8 strace-4.5.16-r1.ebuild 1301
+RMD160 eb1654d089129ca6e12fd556c952c97b049e274f strace-4.5.16-r1.ebuild 1301
+SHA256 d7b42b2a05c4fb795facad5a265af2b56b42762bbf70a282a6c623ec37aa72a2 strace-4.5.16-r1.ebuild 1301
 EBUILD strace-4.5.16.ebuild 1264 RMD160 e64f0710996197ffd03d4c72f65626c3e4c4e458 SHA1 46597baa608d477db0b6cdc687bd1f380b6af0e5 SHA256 3af3b03cead17f854e7a6f41867e18c897ba498ac6e5a94e86a253b475851533
 MD5 da024ac9c08276a834d70d076815f2f6 strace-4.5.16.ebuild 1264
 RMD160 e64f0710996197ffd03d4c72f65626c3e4c4e458 strace-4.5.16.ebuild 1264
 SHA256 3af3b03cead17f854e7a6f41867e18c897ba498ac6e5a94e86a253b475851533 strace-4.5.16.ebuild 1264
-MISC ChangeLog 13496 RMD160 a5ca8c21ea1f1bef5a29ecc2b5b24d5ee9c4e56e SHA1 7af95114762c6fb6f0b4c32e3d8b2950713f9cf6 SHA256 778c68c4b52c6648a7e809776098c05c136c58dfb8206a78227dbbc12ddc0b58
-MD5 6232ed5d3f1dfa4700b2ceb040f704e2 ChangeLog 13496
-RMD160 a5ca8c21ea1f1bef5a29ecc2b5b24d5ee9c4e56e ChangeLog 13496
-SHA256 778c68c4b52c6648a7e809776098c05c136c58dfb8206a78227dbbc12ddc0b58 ChangeLog 13496
+MISC ChangeLog 13686 RMD160 b101c0403d79b20235e2cd1d2c76eff2d7cbc023 SHA1 94fc52853656dd72a45a8bb30e383754cae39a52 SHA256 f823ac522335060401ac6b79389550cba07f8cbf147568286d13e526bd6700b8
+MD5 de1cf3ecc9838b91f3e07cb3f3369da0 ChangeLog 13686
+RMD160 b101c0403d79b20235e2cd1d2c76eff2d7cbc023 ChangeLog 13686
+SHA256 f823ac522335060401ac6b79389550cba07f8cbf147568286d13e526bd6700b8 ChangeLog 13686
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -124,3 +131,10 @@ SHA256 54869e1c65e79c0123fb2481b11a7fe5c8e587be1ffe48856a69563ef2039572 files/di
 MD5 85102137c9aa6a5ab07a75d8d60afa75 files/digest-strace-4.5.16-r1 244
 RMD160 6fc61ed2111a931b50050f1961dd2a997861e2d1 files/digest-strace-4.5.16-r1 244
 SHA256 54869e1c65e79c0123fb2481b11a7fe5c8e587be1ffe48856a69563ef2039572 files/digest-strace-4.5.16-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHi52dj9hvisErhMIRAjycAJ9/oP1mhnOu1dJYt+Hy9urGum6OzQCffmNh
+Uxv3SXTHpw1aUcz/ZdEfQ9g=
+=JSZz
+-----END PGP SIGNATURE-----
diff --git a/dev-util/strace/files/strace-4.5.16-getdents-infinite-loop.patch b/dev-util/strace/files/strace-4.5.16-getdents-infinite-loop.patch
new file mode 100644
index 000000000000..20bdcdfcff23
--- /dev/null
+++ b/dev-util/strace/files/strace-4.5.16-getdents-infinite-loop.patch
@@ -0,0 +1,26 @@
+if the getdents struct is corrupt, strace will loop forever
+
+--- strace/file.c
++++ strace/file.c
+@@ -2414,6 +2414,10 @@ struct tcb *tcp;
+ #endif /* SUNOS4 */
+ 		i += d->d_reclen;
+ 		dents++;
++		if (!d->d_reclen) {
++			fprintf(stderr, "[error: d->d_reclen == 0] ");
++			break;
++		}
+ 	}
+ 	if (!abbrev(tcp))
+ 		tprintf("}");
+@@ -2466,6 +2470,10 @@ struct tcb * tcp;
+ 		}
+ 		i += d->d_reclen;
+ 		dents++;
++		if (!d->d_reclen) {
++			fprintf(stderr, "[error: d->d_reclen == 0] ");
++			break;
++		}
+ 	}
+ 	if (!abbrev(tcp))
+ 		tprintf("}");
diff --git a/dev-util/strace/strace-4.5.16-r1.ebuild b/dev-util/strace/strace-4.5.16-r1.ebuild
index deebf208de59..a253fb999590 100644
--- a/dev-util/strace/strace-4.5.16-r1.ebuild
+++ b/dev-util/strace/strace-4.5.16-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.16-r1.ebuild,v 1.4 2007/12/26 16:12:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.16-r1.ebuild,v 1.5 2008/01/14 17:36:23 vapier Exp $
 
 inherit flag-o-matic autotools
 
@@ -27,6 +27,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-mips-syscallent.patch
 	epatch "${FILESDIR}"/${P}-sh-updates.patch
 	epatch "${FILESDIR}"/${P}-sparc-updates.patch #162789
+	epatch "${FILESDIR}"/${P}-getdents-infinite-loop.patch
 
 	eautoreconf
 }