diff options
| author | vk226950 <none@none> | 2008-07-17 11:46:59 -0700 |
|---|---|---|
| committer | vk226950 <none@none> | 2008-07-17 11:46:59 -0700 |
| commit | d0ecda70e958c51a970bcec3ea2d03e2d177ff73 (patch) | |
| tree | cbdc6251736335436e1a8cf9bb585ef40bd64ab2 /usr/src | |
| parent | 51ed222c2fc6323afd9dbad575738fe07eda3247 (diff) | |
| download | illumos-joyent-d0ecda70e958c51a970bcec3ea2d03e2d177ff73.tar.gz | |
6595460 Incorrect picno is assigned by cpustat/cputrack for eventnames with numbers.
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/cpc/common/strtoset.c | 12 | ||||
| -rw-r--r-- | usr/src/lib/libcpc/common/libcpc.c | 7 |
2 files changed, 13 insertions, 6 deletions
diff --git a/usr/src/cmd/cpc/common/strtoset.c b/usr/src/cmd/cpc/common/strtoset.c index 1becfe7e2c..b61f7d75b8 100644 --- a/usr/src/cmd/cpc/common/strtoset.c +++ b/usr/src/cmd/cpc/common/strtoset.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -116,8 +116,10 @@ event_walker(void *arg, uint_t picno, const char *event) static int event_valid(int picnum, char *event) { + char *end_event; found = 0; + cpc_walk_events_pic(cpc, picnum, event, event_walker); if (found) @@ -128,8 +130,10 @@ event_valid(int picnum, char *event) * a raw event code. An event code of '0' is not recognized, as it * already has a corresponding event name in existing backends and it * is the only reasonable way to know if strtol() succeeded. + * Check the second argument of strtol() to ensure invalid events + * beginning with number do not go through. */ - if (strtol(event, NULL, 0) != 0) + if ((strtol(event, &end_event, 0) != 0) && (*end_event == '\0')) /* * Success - this is a valid raw code in hex, decimal, or octal. */ @@ -531,8 +535,8 @@ cpc_strtoset(cpc_t *cpcin, const char *spec, int smt) free(req_attrs); (void) cpc_set_destroy(cpc, set); strtoset_err( - gettext("cpc_set_add_request() failed: %s\n"), - strerror(errno)); + gettext("cpc_set_add_request() failed: %s\n"), + strerror(errno)); goto inval; } diff --git a/usr/src/lib/libcpc/common/libcpc.c b/usr/src/lib/libcpc/common/libcpc.c index 058e163ccd..df431abcc4 100644 --- a/usr/src/lib/libcpc/common/libcpc.c +++ b/usr/src/lib/libcpc/common/libcpc.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -1074,6 +1074,7 @@ static int cpc_valid_event(cpc_t *cpc, uint_t pic, const char *ev) { struct priv pr = { NULL, 0 }; + char *end_ev; pr.name = ev; cpc_walk_events_pic(cpc, pic, &pr, ev_walker); @@ -1085,8 +1086,10 @@ cpc_valid_event(cpc_t *cpc, uint_t pic, const char *ev) * a raw event code. An event code of '0' is not recognized, as it * already has a corresponding event name in existing backends and it * is the only reasonable way to know if strtol() succeeded. + * Check the second argument of strtol() to ensure invalid events + * beginning with number do not go through. */ - if (strtol(ev, NULL, 0) != 0) + if ((strtol(ev, &end_ev, 0) != 0) && (*end_ev == '\0')) /* * Success - this is a valid raw code in hex, decimal, or octal. */ |