emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

library: fix major oops in procps_pids_reap() function

Browse Source 
In my zeal to finalize the initial pids implementation
I omitted some quite important parameter checking from
the above function. Thank goodness top was kind to us.

Also, in anticipation of the additions of single stack
read and supporting functions some items were renamed.

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2015-08-26 00:00:00 -05:00 committed by Craig Small
parent 66cd99270d
commit def5858810
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
proc/pids.c
View File

@ -956,10 +956,17 @@ PROCPS_EXPORT struct pids_reap *procps_pids_reap (
#define n_alloc info->alloc_total #define n_alloc info->alloc_total
#define n_inuse info->inuse_total #define n_inuse info->inuse_total
static proc_t task; // static for initial zeroes + later dynamic free(s) static proc_t task; // static for initial zeroes + later dynamic free(s)
proc_t*(*read_something)(PROCTAB*, proc_t*); proc_t*(*reap_something)(PROCTAB*, proc_t*);
struct pids_stacks *ext; struct pids_stacks *ext;
int n_save = n_alloc; int n_save = n_alloc;
if (info == NULL)
return NULL;
if (!info->maxitems && !info->curitems)
return NULL;
if (which != PROCPS_REAP_TASKS_ONLY && which != PROCPS_REAP_THREADS_TOO)
return NULL;
if (!info->anchor) { if (!info->anchor) {
if ((!(info->anchor = calloc(sizeof(void *), MEMORY_INCR))) if ((!(info->anchor = calloc(sizeof(void *), MEMORY_INCR)))
|| (!(info->reaped.stacks = calloc(sizeof(void *), MEMORY_INCR))) || (!(info->reaped.stacks = calloc(sizeof(void *), MEMORY_INCR)))
@ -975,7 +982,7 @@ PROCPS_EXPORT struct pids_reap *procps_pids_reap (
if (!oldproc_open(info, 0)) if (!oldproc_open(info, 0))
return NULL; return NULL;
toggle_history(info); toggle_history(info);
read_something = which ? readeither : readproc; reap_something = which ? readeither : readproc;
for (n_inuse = 0; ; n_inuse++) { for (n_inuse = 0; ; n_inuse++) {
if (n_inuse == n_alloc) { if (n_inuse == n_alloc) {
@ -985,7 +992,7 @@ PROCPS_EXPORT struct pids_reap *procps_pids_reap (
return NULL; return NULL;
memcpy(info->anchor + n_inuse, ext->stacks, sizeof(void *) * MEMORY_INCR); memcpy(info->anchor + n_inuse, ext->stacks, sizeof(void *) * MEMORY_INCR);
} }
if (NULL == read_something(info->PT, &task)) if (NULL == reap_something(info->PT, &task))
break; break;
if (!tally_proc(info, &info->reaped.counts, &task)) if (!tally_proc(info, &info->reaped.counts, &task))
return NULL; return NULL;
@ -1131,6 +1138,7 @@ PROCPS_EXPORT int procps_pids_stacks_dealloc (
struct pids_stacks **these) struct pids_stacks **these)
{ {
struct stacks_extent *ext; struct stacks_extent *ext;
int rc;
if (info == NULL || these == NULL) if (info == NULL || these == NULL)
return -EINVAL; return -EINVAL;
@ -1138,7 +1146,7 @@ PROCPS_EXPORT int procps_pids_stacks_dealloc (
return -EINVAL; return -EINVAL;
ext = (struct stacks_extent *)(*these); ext = (struct stacks_extent *)(*these);
int rc = free_extent(info, ext); rc = free_extent(info, ext);
*these = NULL; *these = NULL;
return rc; return rc;
} // end: procps_pids_stacks_dealloc } // end: procps_pids_stacks_dealloc