Fixed chkutmp crash, bug #184962, thank barbaz for report and Stewart Gebbie for the fix.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 71 insertions, 4 deletions

diff --git a/app-forensics/chkrootkit/ChangeLog b/app-forensics/chkrootkit/ChangeLog
index d87c5a81b8b9..ae66cad83c8f 100644
--- a/app-forensics/chkrootkit/ChangeLog
+++ b/app-forensics/chkrootkit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-forensics/chkrootkit
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/ChangeLog,v 1.47 2008/10/06 19:38:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/ChangeLog,v 1.48 2008/10/06 20:00:11 pva Exp $
+
+*chkrootkit-0.48-r1 (06 Oct 2008)
+
+  06 Oct 2008; Peter Volkov <pva@gentoo.org>
+  +files/chkrootkit-0.48-chkutmp.c-some-overruns-fixes.patch,
+  -chkrootkit-0.48.ebuild, +chkrootkit-0.48-r1.ebuild:
+  Fixed chkutmp crash, bug #184962, thank barbaz for report and Stewart
+  Gebbie for the fix.
 
 *chkrootkit-0.48 (06 Oct 2008)
 
diff --git a/app-forensics/chkrootkit/Manifest b/app-forensics/chkrootkit/Manifest
index 822d07b1d3df..995ec448ab0a 100644
--- a/app-forensics/chkrootkit/Manifest
+++ b/app-forensics/chkrootkit/Manifest
@@ -1,5 +1,6 @@
 AUX chkrootkit-0.47-add-missing-includes.diff 152 RMD160 12cec174e951f388021cf877115e1e710c0e55e9 SHA1 ccf69ed8f3c635c628541e248e1825692e0c8943 SHA256 3b194908c2127a0e48558ad6b058cac6eb1048e3abab6814af09c23085c4070b
 AUX chkrootkit-0.47-makefile.diff 1895 RMD160 f9993fe6b97afefd4838a142050e90bce7c29737 SHA1 da6a7185fb9201fbce8caec65ed2c2d7f911e706 SHA256 7f92e89219f0d308f534072329e0904fe372d3ff7612c33265dec5c3c11014c9
+AUX chkrootkit-0.48-chkutmp.c-some-overruns-fixes.patch 1448 RMD160 f425e5149a7a9d7f6c359a484a7a3506ee5f4740 SHA1 a79464038c6b069489fe9adb555c77eb4a402a92 SHA256 34652a287c13aa009cda9e2a1a167fd73e474836a5e3fbfe3c999a24a243e6c6
 AUX chkrootkit-0.48-shell-history-anomalies.diff 957 RMD160 c01c394f259da39a7f6ff89982f9b82efd9954ed SHA1 a9a0251fd1ebbbc8f7857ac4fadc7632c706cb8a SHA256 77008eb1c35d0829156bf034ee2b303d9048d3ad3af27742af6967cef80754b1
 AUX chkrootkit.cron 78 RMD160 54e1c50088e2a90fad7340c0d0ebbe2099ff3dcc SHA1 1598c7ea3abf7c2497c30953d92d51cb42496eeb SHA256 3dfcff479e3b9e1cd79c6a65e0e668750dec0a88b09715d4fdf163c692a22412
 DIST chkrootkit-0.45-gentoo.diff.bz2 3729 RMD160 84c1ca6b0f791b0727a1e61d104b23b4b3a9eb68 SHA1 b28633113895723de85ddc3b66b561d4a68c746c SHA256 ca26f4113c2e511f87179bc673faa198ab9b2e6d6de0134443ed301f0ebb1362
@@ -7,6 +8,6 @@ DIST chkrootkit-0.47.tar.gz 37791 RMD160 291746f60d0cc3bcf0e63387f3d7ff16a4215d1
 DIST chkrootkit-0.48-gentoo.diff.bz2 4519 RMD160 0c8efb2780c298523d245aaa63c74b71bb83f8b2 SHA1 c730de0a2349ae8010d620c8000d083653ce6377 SHA256 91e6986ecaf6f44684127e3ddcdeb0ef74587660e20193d34cad76233321f83a
 DIST chkrootkit-0.48.tar.gz 38323 RMD160 4ab07d02dd9c366b32383d84a339ef72cd4e6703 SHA1 edbaf062a78f4210a7dbe9ef935cb86d12695d91 SHA256 b4b3d3540a7022aa7a81cae93f28c8475bc2660a21f88126725624c09769f1fb
 EBUILD chkrootkit-0.47.ebuild 1732 RMD160 a01de8a106fd460668e11d2443dd54e7cef6b87a SHA1 ddd02869aa3b65ea592340e3bcd89de1b9c8c404 SHA256 0363cf50aab5fef3d6959fcb58b7ee21a01c18b708cae9e60e9a2abb2aa0a5e6
-EBUILD chkrootkit-0.48.ebuild 1386 RMD160 0822beacb30c3f233ea5f423cdc14a9667f15d95 SHA1 2c5e95f7324701151abe98b6fcdf6b015383ef47 SHA256 bb9879a4f2d2e5509fe4ef97eb8f2017ccedb5d897ecbef07d438f45cedc2c80
-MISC ChangeLog 12420 RMD160 3137c72747b6eb93b01899f8145bedbd50f307ba SHA1 44a6ee92cd9135926ee57688546ce4dbb0d6e81d SHA256 324dac30629b1ed0330a7476894fdc7ecf2bf27b018539e8d887fbe268212af7
+EBUILD chkrootkit-0.48-r1.ebuild 1452 RMD160 3ab715e51582d9c077f7c05637814ff716885f0c SHA1 2d5f0a7ffd195176789f95baaed7bc64a5211a51 SHA256 632936666975d57d539772eff2a1544531dc687d76e50ec2bdef5eb5b5cd840d
+MISC ChangeLog 12712 RMD160 fcfe23c9d30f96fc58a5e18e7104c490090dfddc SHA1 ef77b277a1836f1e5cabc8cd9d8167368e349e13 SHA256 447f553e3b0d728f53a1acef199f2e3f697f261ee02863de4cbfa293b6a90197
 MISC metadata.xml 163 RMD160 cd9adc76a05a5a4d079045e90a823e487000fbe0 SHA1 499d07496dd075e4685d50b4a3284386d29d7de4 SHA256 a072456ba64483cd3108f6125498634a060a449c9ce7dfa512549fbf78601e09
diff --git a/app-forensics/chkrootkit/chkrootkit-0.48.ebuild b/app-forensics/chkrootkit/chkrootkit-0.48-r1.ebuild
index 72c739aabf37..e1f30d27d78e 100644
--- a/app-forensics/chkrootkit/chkrootkit-0.48.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.48-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/chkrootkit-0.48.ebuild,v 1.1 2008/10/06 19:38:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/chkrootkit-0.48-r1.ebuild,v 1.1 2008/10/06 20:00:11 pva Exp $
 
 inherit eutils toolchain-funcs
 
@@ -20,6 +20,7 @@ src_unpack() {
 
 	epatch "${WORKDIR}/${P}-gentoo.diff"
 	epatch "${FILESDIR}/${P}-shell-history-anomalies.diff"
+	epatch "${FILESDIR}/${P}-chkutmp.c-some-overruns-fixes.patch"
 	sed -i 's:/var/adm/:/var/log/:g' chklastlog.c || die "sed chklastlog.c failed"
 }
 
diff --git a/app-forensics/chkrootkit/files/chkrootkit-0.48-chkutmp.c-some-overruns-fixes.patch b/app-forensics/chkrootkit/files/chkrootkit-0.48-chkutmp.c-some-overruns-fixes.patch
new file mode 100644
index 000000000000..09ba065a0697
--- /dev/null
+++ b/app-forensics/chkrootkit/files/chkrootkit-0.48-chkutmp.c-some-overruns-fixes.patch
@@ -0,0 +1,57 @@
+=== modified file 'chkutmp.c'
+--- chkutmp.c	2008-10-06 19:07:51 +0000
++++ chkutmp.c	2007-10-20 07:56:19 +0000
+@@ -23,6 +23,7 @@
+  *
+  *  Changelog: 
+  *   Ighighi X - Improved speed via break command - 2005/03/27 
++ *   Stewart Gebbie - fixed buffer overrun bug related to MAXREAD and UT_PIDLENGTH - 2007-10-20
+  *  
+  */
+ 
+@@ -42,7 +43,7 @@
+ #endif
+ #include <ctype.h>
+ 
+-#define MAXREAD 1024
++#define MAXREAD 4096
+ #define MAXBUF 4096
+ #define MAXLENGTH 256
+ #define UT_PIDSIZE 12
+@@ -57,13 +58,13 @@
+ #endif
+ 
+ struct ps_line {
+-    char ps_tty[UT_LINESIZE];
+-    char ps_user[UT_NAMESIZE];
+-    char ps_args[MAXLENGTH];
++    char ps_tty[UT_LINESIZE+1];
++    char ps_user[UT_NAMESIZE+1];
++    char ps_args[MAXLENGTH+1];
+     int ps_pid;
+ };
+ struct utmp_line {
+-    char ut_tty[UT_LINESIZE];
++    char ut_tty[UT_LINESIZE+1];
+     int ut_pid;
+     int ut_type;
+ };
+@@ -77,7 +78,7 @@
+ int fetchps(struct ps_line *psl_p)
+ {
+     FILE *ps_fp;
+-    char line[MAXREAD + 1], pid[UT_PIDSIZE];
++    char line[MAXREAD + 1], pid[UT_PIDSIZE+1];
+     char *s, *d;
+     struct ps_line *curp = &psl_p[0];
+     struct ps_line *endp = &psl_p[MAXBUF];
+@@ -97,7 +98,7 @@
+ 		while (isspace(*s))	/* skip spaces */
+ 		    s++;
+ 		d = pid;
+-		for (x = 0; (!isspace(*s)) && (*d++ = *s++) && x <= UT_LINESIZE; x++)	/* grab pid */
++		for (x = 0; (!isspace(*s)) && (*d++ = *s++) && x <= UT_PIDSIZE; x++)	/* grab pid */
+ 		    ;
+ 		*d = '\0';
+ 		curp->ps_pid = atoi(pid);
+