summaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorJovi Zhang <bookjovi@gmail.com>2011-07-25 22:08:08 +0800
committerArnaldo Carvalho de Melo <acme@redhat.com>2011-08-08 09:35:41 -0300
commitce27a443d17dccf613079a7147cf0d220bc4ec82 (patch)
treec9fecd9884b167a2c4bdae80653d919b2ba6474e /tools/perf
parent00894ce9b85887caa0c16e18757004b9cc9f64cf (diff)
downloadop-kernel-dev-ce27a443d17dccf613079a7147cf0d220bc4ec82.zip
op-kernel-dev-ce27a443d17dccf613079a7147cf0d220bc4ec82.tar.gz
perf probe: Fix coredump introduced by probe module option
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 <mingo@elte.hu> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1311602888-2389-1-git-send-email-bookjovi@gmail.com Signed-off-by: Jovi Zhang <bookjovi@gmail.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/util/probe-event.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index b82d54f..1c7bfa5 100644
--- 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;
OpenPOWER on IntegriCloud