projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e944ec2
)
perf probe: Fix segfault if passed with ''.
author
Wang Nan
<
[email protected]
>
Tue, 28 Apr 2015 08:46:09 +0000
(08:46 +0000)
committer
Arnaldo Carvalho de Melo
<
[email protected]
>
Tue, 5 May 2015 15:26:52 +0000
(12:26 -0300)
Since parse_perf_probe_point() deals with a user passed argument, we
should not assume it to be a valid string.
Without this patch, if pass '' to perf probe, a segfault raises:
$ perf probe -a ''
Segmentation fault
This patch checks argument of parse_perf_probe_point() before
string processing.
After this patch:
$ perf probe -a ''
usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
...
Signed-off-by: Wang Nan <
[email protected]
>
Acked-by: Masami Hiramatsu <
[email protected]
>
Tested-by: Arnaldo Carvalho de Melo <
[email protected]
>
Cc: David Ahern <
[email protected]
>
Cc: Jiri Olsa <
[email protected]
>
Cc: Paul Mackerras <
[email protected]
>
Cc: Peter Zijlstra <
[email protected]
>
Cc: Zefan Li <
[email protected]
>
Link:
http://lkml.kernel.org/r/
[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <
[email protected]
>
tools/perf/util/probe-event.c
patch
|
blob
|
history
diff --git
a/tools/perf/util/probe-event.c
b/tools/perf/util/probe-event.c
index d8bb616ff57c29b38c05ac134d35e88f646f42cd..d05b77cf35f77051354b9d08acc035cf4575dd5b 100644
(file)
--- a/
tools/perf/util/probe-event.c
+++ b/
tools/perf/util/probe-event.c
@@
-1084,6
+1084,8
@@
static int parse_perf_probe_point(char *arg, struct perf_probe_event *pev)
*
* TODO:Group name support
*/
+ if (!arg)
+ return -EINVAL;
ptr = strpbrk(arg, ";=@+%");
if (ptr && *ptr == '=') { /* Event name */