path: root/tools/perf/builtin-probe.c
diff options
authorMasami Hiramatsu <>2015-09-16 21:52:42 +0900
committerArnaldo Carvalho de Melo <>2015-09-21 18:01:17 -0300
commit0fb18553478dee5b3d8dc0af4f99a5288e81142f (patch)
tree20bf723452b413dc73eaefc932b7fbb67aeca20d /tools/perf/builtin-probe.c
parent96f3eda67fcf2598e9d2794398e0e7ab35138ea6 (diff)
perf probe: Fix a segfault when removing uprobe events
Fix a segfault bug and a small mistake in perf probe -d. Since the "ulist" in perf_del_probe_events is never initialized, strlist__add(ulist, *) always causes a segfault when removing uprobe events by perf probe -d. Also, the "str" local variable is never released if fail to allocate the "klist". This fixes it too. This has been introduced by the commit e607f1426b58 ("perf probe: Print deleted events in cmd_probe()"). Reported-by: Milian Wolff <> Signed-off-by: Masami Hiramatsu <> Cc: Namhyung Kim <> Link: Signed-off-by: Arnaldo Carvalho de Melo <>
Diffstat (limited to 'tools/perf/builtin-probe.c')
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 94385ee89dc8..f7882ae9ebc6 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -380,8 +380,11 @@ static int perf_del_probe_events(struct strfilter *filter)
goto out;
klist = strlist__new(NULL, NULL);
- if (!klist)
- return -ENOMEM;
+ ulist = strlist__new(NULL, NULL);
+ if (!klist || !ulist) {
+ ret = -ENOMEM;
+ goto out;
+ }
ret = probe_file__get_events(kfd, filter, klist);
if (ret == 0) {