This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [patchv2] Fix crash on process name "(sd-pam)" (PR 16594)
- From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- To: Pedro Alves <palves at redhat dot com>
- Cc: gdb-patches at sourceware dot org, Sergio Durigan Junior <sergiodj at redhat dot com>
- Date: Fri, 21 Feb 2014 18:24:20 +0100
- Subject: Re: [patchv2] Fix crash on process name "(sd-pam)" (PR 16594)
- Authentication-results: sourceware.org; auth=none
- References: <20140217212826 dot GA15080 at host2 dot jankratochvil dot net> <20140217220454 dot GA16717 at host2 dot jankratochvil dot net> <530738BA dot 5010306 at redhat dot com> <53073EC1 dot 5060900 at redhat dot com>
On Fri, 21 Feb 2014 12:55:45 +0100, Pedro Alves wrote:
> I noticed that 'ps' gets this right, so I've peeked at its
> sources, and it just looks for the first ')' starting at
> the end.
Done.
> http://procps.cvs.sourceforge.net/viewvc/procps/procps/proc/readproc.c?revision=1.57&view=markup
The current procps-ng source is (the stat2proc() code is the same there):
https://gitorious.org/procps/procps/source/dc072aced7250fed9b01fb05f0d672678752a63e:proc/readproc.c
Thanks,
Jan
gdb/
2014-02-21 Jan Kratochvil <jan.kratochvil@redhat.com>
PR gdb/16594
* common/linux-osdata.c (linux_common_core_of_thread): Find the end of
process name.
(get_cores_used_by_process): New parameter num_cores, use it.
(linux_xfer_osdata_processes): Pass num_cores to it.
* linux-tdep.c (linux_info_proc, linux_fill_prpsinfo): Find the end of
process name.
diff --git a/gdb/common/linux-osdata.c b/gdb/common/linux-osdata.c
index 805850c..dae637b 100644
--- a/gdb/common/linux-osdata.c
+++ b/gdb/common/linux-osdata.c
@@ -96,11 +96,8 @@ linux_common_core_of_thread (ptid_t ptid)
}
}
- p = strchr (content, '(');
-
- /* Skip ")". */
- if (p != NULL)
- p = strchr (p, ')');
+ /* ps command also relies on no trailing fields ever contain ')'. */
+ p = strrchr (content, ')');
if (p != NULL)
p++;
@@ -258,11 +255,10 @@ get_process_owner (uid_t *owner, PID_T pid)
}
/* Find the CPU cores used by process PID and return them in CORES.
- CORES points to an array of at least sysconf(_SC_NPROCESSOR_ONLN)
- elements. */
+ CORES points to an array of NUM_CORES elements. */
static int
-get_cores_used_by_process (PID_T pid, int *cores)
+get_cores_used_by_process (PID_T pid, int *cores, const int num_cores)
{
char taskdir[sizeof ("/proc/") + MAX_PID_T_STRLEN + sizeof ("/task") - 1];
DIR *dir;
@@ -286,7 +282,7 @@ get_cores_used_by_process (PID_T pid, int *cores)
core = linux_common_core_of_thread (ptid_build ((pid_t) pid,
(pid_t) tid, 0));
- if (core >= 0)
+ if (core >= 0 && core < num_cores)
{
++cores[core];
++task_count;
@@ -350,7 +346,7 @@ linux_xfer_osdata_processes (gdb_byte *readbuf,
/* Find CPU cores used by the process. */
cores = (int *) xcalloc (num_cores, sizeof (int));
- task_count = get_cores_used_by_process (pid, cores);
+ task_count = get_cores_used_by_process (pid, cores, num_cores);
cores_str = (char *) xcalloc (task_count, sizeof ("4294967295") + 1);
for (i = 0; i < num_cores && task_count > 0; ++i)
diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
index bd1e5a2..c10b8ee 100644
--- a/gdb/linux-tdep.c
+++ b/gdb/linux-tdep.c
@@ -476,7 +476,9 @@ linux_info_proc (struct gdbarch *gdbarch, char *args,
p = skip_spaces_const (p);
if (*p == '(')
{
- const char *ep = strchr (p, ')');
+ /* ps command also relies on no trailing fields
+ ever contain ')'. */
+ const char *ep = strrchr (p, ')');
if (ep != NULL)
{
printf_filtered ("Exec file: %.*s\n",
@@ -1331,12 +1333,14 @@ linux_fill_prpsinfo (struct elf_internal_linux_prpsinfo *p)
proc_stat = skip_spaces (proc_stat);
- /* Getting rid of the executable name, since we already have it. We
- know that this name will be in parentheses, so we can safely look
- for the close-paren. */
- while (*proc_stat != ')')
- ++proc_stat;
- ++proc_stat;
+ /* ps command also relies on no trailing fields ever contain ')'. */
+ proc_stat = strrchr (proc_stat, ')');
+ if (proc_stat == NULL)
+ {
+ do_cleanups (c);
+ return 1;
+ }
+ proc_stat++;
proc_stat = skip_spaces (proc_stat);