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:
00894ce
)
perf probe: Fix coredump introduced by probe module option
author
Jovi Zhang
<
[email protected]
>
Mon, 25 Jul 2011 14:08:08 +0000
(22:08 +0800)
committer
Arnaldo Carvalho de Melo
<
[email protected]
>
Mon, 8 Aug 2011 12:35:41 +0000
(09:35 -0300)
perf will coredump if the user doesn't give the "-m" option in probe
command, this patch fixes it.
[root@localhost perf]# ./perf probe --add='PROBE'
Segmentation fault (core dumped)
Cc: Ingo Molnar <
[email protected]
>
Cc: Paul Mackerras <
[email protected]
>
Cc: Peter Zijlstra <
[email protected]
>
Link:
http://lkml.kernel.org/r/
[email protected]
Signed-off-by: Jovi Zhang <
[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 b82d54fa2c566d420a32e2e675c873a6ce7c7720..1c7bfa5fe0a81052fa1718cf996ef80c21d2e96e 100644
(file)
--- a/
tools/perf/util/probe-event.c
+++ b/
tools/perf/util/probe-event.c
@@
-1820,11
+1820,15
@@
static int convert_to_probe_trace_events(struct perf_probe_event *pev,
ret = -ENOMEM;
goto error;
}
- tev->point.module = strdup(module);
- if (tev->point.module == NULL) {
- ret = -ENOMEM;
- goto error;
+
+ if (module) {
+ tev->point.module = strdup(module);
+ if (tev->point.module == NULL) {
+ ret = -ENOMEM;
+ goto error;
+ }
}
+
tev->point.offset = pev->point.offset;
tev->point.retprobe = pev->point.retprobe;
tev->nargs = pev->nargs;