git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'imx/pata' and 'imx/sata' into next/driver
[pandora-kernel.git]
/
tools
/
perf
/
util
/
parse-events.c
diff --git
a/tools/perf/util/parse-events.c
b/tools/perf/util/parse-events.c
index
4ea7e19
..
928918b
100644
(file)
--- a/
tools/perf/util/parse-events.c
+++ b/
tools/perf/util/parse-events.c
@@
-697,7
+697,11
@@
parse_raw_event(const char **strp, struct perf_event_attr *attr)
return EVT_FAILED;
n = hex2u64(str + 1, &config);
if (n > 0) {
return EVT_FAILED;
n = hex2u64(str + 1, &config);
if (n > 0) {
- *strp = str + n + 1;
+ const char *end = str + n + 1;
+ if (*end != '\0' && *end != ',' && *end != ':')
+ return EVT_FAILED;
+
+ *strp = end;
attr->type = PERF_TYPE_RAW;
attr->config = config;
return EVT_HANDLED;
attr->type = PERF_TYPE_RAW;
attr->config = config;
return EVT_HANDLED;
@@
-1097,6
+1101,4
@@
void print_events(const char *event_glob)
printf("\n");
print_tracepoint_events(NULL, NULL);
printf("\n");
print_tracepoint_events(NULL, NULL);
-
- exit(129);
}
}