From b5c707f0dbe0faeb73af438b64ee64894b349a2fc404a308cf8c7fb186e9564f Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 4 Mar 2010 08:50:51 +0000 Subject: [PATCH] Accepting request 33901 from home:oertel:branches:Base:System Copy from home:oertel:branches:Base:System/psmisc via accept of submit request 33901 revision 2. Request was accepted with message: OBS-URL: https://build.opensuse.org/request/show/33901 OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=17 --- psmisc-22.7-pstree_overflow.patch | 11 +++++++++++ psmisc.changes | 6 ++++++ psmisc.spec | 2 ++ 3 files changed, 19 insertions(+) create mode 100644 psmisc-22.7-pstree_overflow.patch diff --git a/psmisc-22.7-pstree_overflow.patch b/psmisc-22.7-pstree_overflow.patch new file mode 100644 index 0000000..285c5b8 --- /dev/null +++ b/psmisc-22.7-pstree_overflow.patch @@ -0,0 +1,11 @@ +--- src/pstree.c ++++ src/pstree.c +@@ -70,7 +70,7 @@ + + typedef struct _proc + { +- char comm[COMM_LEN + 1]; ++ char comm[COMM_LEN + 2 + 1]; /* add another 2 for thread brackets */ + char **argv; /* only used : argv[0] is 1st arg; undef if argc < 1 */ + int argc; /* with -a : number of arguments, -1 if swapped */ + pid_t pid; diff --git a/psmisc.changes b/psmisc.changes index ab03900..9c0430c 100644 --- a/psmisc.changes +++ b/psmisc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 4 02:24:15 CET 2010 - ro@suse.de + +- fix overflow crash in pstree: add 2 to COMM_LEN for {...} + brackets for threads + ------------------------------------------------------------------- Sun Dec 6 15:07:16 CET 2009 - jengelh@medozas.de diff --git a/psmisc.spec b/psmisc.spec index 3a6b655..7dc9eee 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -40,6 +40,7 @@ Patch5: %name-22.6-fdleak.patch Patch6: %name-22.6-tigetstr.patch Patch7: %name-22.7-memleaks.patch Patch8: %name-22.8-to-22.7-backport.patch +Patch9: psmisc-22.7-pstree_overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nopeek s390 s390x ia64 %arm %sparc @@ -68,6 +69,7 @@ Authors: %patch7 -p0 -b .memleaks %patch0 -p0 %patch8 -p0 +%patch9 -p0 %build autoreconf -fi