diff options
author | Masami Hiramatsu <mhiramat@redhat.com> | 2009-12-07 12:00:46 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-12-07 12:33:21 -0500 |
commit | e1d2017b24fb31602f1128e6a8b2afc54c9283cd (patch) | |
tree | 7d085171e62e7c241438c22ea039d59554873da9 /tools/perf/util/probe-event.c | |
parent | d56728b8d7fb3e1e5e5f97b88fdf6b43a35b4f5e (diff) |
perf probe: Fix event namelist to duplicate string
Fix event namelist to duplicate string. Without duplicating, adding
multiple probes causes stack overwrite bug, because it reuses a
buffer on stack while the buffer is already added in the namelist.
String duplication solves this bug because only contents of the
buffer is copied to the namelist.
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: systemtap <systemtap@sources.redhat.com>
Cc: DLE <dle-develop@lists.sourceforge.net>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20091207170046.19230.55557.stgit@dhcp-100-2-132.bos.redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/probe-event.c')
-rw-r--r-- | tools/perf/util/probe-event.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index cd7fbda5e2a5..de0d91385c91 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c | |||
@@ -413,12 +413,13 @@ static struct strlist *get_perf_event_names(int fd) | |||
413 | 413 | ||
414 | rawlist = get_trace_kprobe_event_rawlist(fd); | 414 | rawlist = get_trace_kprobe_event_rawlist(fd); |
415 | 415 | ||
416 | sl = strlist__new(false, NULL); | 416 | sl = strlist__new(true, NULL); |
417 | for (i = 0; i < strlist__nr_entries(rawlist); i++) { | 417 | for (i = 0; i < strlist__nr_entries(rawlist); i++) { |
418 | ent = strlist__entry(rawlist, i); | 418 | ent = strlist__entry(rawlist, i); |
419 | parse_trace_kprobe_event(ent->s, &group, &event, NULL); | 419 | parse_trace_kprobe_event(ent->s, &group, &event, NULL); |
420 | strlist__add(sl, event); | 420 | strlist__add(sl, event); |
421 | free(group); | 421 | free(group); |
422 | free(event); | ||
422 | } | 423 | } |
423 | 424 | ||
424 | strlist__delete(rawlist); | 425 | strlist__delete(rawlist); |
@@ -480,5 +481,6 @@ void add_trace_kprobe_events(struct probe_point *probes, int nr_probes) | |||
480 | strlist__add(namelist, event); | 481 | strlist__add(namelist, event); |
481 | } | 482 | } |
482 | } | 483 | } |
484 | strlist__delete(namelist); | ||
483 | close(fd); | 485 | close(fd); |
484 | } | 486 | } |