public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Masami Hiramatsu <mhiramat@redhat.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, acme@redhat.com, hpa@zytor.com,
	mingo@redhat.com, dle-develop@lists.sourceforge.net,
	fweisbec@gmail.com, tglx@linutronix.de, mhiramat@redhat.com,
	mingo@elte.hu, systemtap@sources.redhat.com
Subject: [tip:perf/urgent] perf probe: Fix event namelist to duplicate string
Date: Mon, 7 Dec 2009 17:37:03 GMT	[thread overview]
Message-ID: <tip-e1d2017b24fb31602f1128e6a8b2afc54c9283cd@git.kernel.org> (raw)
In-Reply-To: <20091207170046.19230.55557.stgit@dhcp-100-2-132.bos.redhat.com>

Commit-ID:  e1d2017b24fb31602f1128e6a8b2afc54c9283cd
Gitweb:     http://git.kernel.org/tip/e1d2017b24fb31602f1128e6a8b2afc54c9283cd
Author:     Masami Hiramatsu <mhiramat@redhat.com>
AuthorDate: Mon, 7 Dec 2009 12:00:46 -0500
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Mon, 7 Dec 2009 18:33:21 +0100

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>
---
 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 cd7fbda..de0d913 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)
 
 	rawlist = get_trace_kprobe_event_rawlist(fd);
 
-	sl = strlist__new(false, NULL);
+	sl = strlist__new(true, NULL);
 	for (i = 0; i < strlist__nr_entries(rawlist); i++) {
 		ent = strlist__entry(rawlist, i);
 		parse_trace_kprobe_event(ent->s, &group, &event, NULL);
 		strlist__add(sl, event);
 		free(group);
+		free(event);
 	}
 
 	strlist__delete(rawlist);
@@ -480,5 +481,6 @@ void add_trace_kprobe_events(struct probe_point *probes, int nr_probes)
 			strlist__add(namelist, event);
 		}
 	}
+	strlist__delete(namelist);
 	close(fd);
 }

  reply	other threads:[~2009-12-07 17:39 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-07 17:00 [BUGFIX PATCH -tip 0/5] perf-probe/x86 insn decoder bugfixes Masami Hiramatsu
2009-12-07 17:00 ` [BUGFIX PATCH -tip 1/5] x86 insn: Delete empty or incomplete inat-tables.c Masami Hiramatsu
2009-12-07 17:36   ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-07 17:00 ` [BUGFIX PATCH -tip 2/5] perf probe: Fix strtailcmp() to compare s1[0] and s2[0] Masami Hiramatsu
2009-12-07 17:36   ` [tip:perf/urgent] perf probe: Fix strtailcmp() to compare s1and s2[0] tip-bot for Juha Leppanen
2009-12-07 17:00 ` [BUGFIX PATCH -tip 3/5] perf probe: Fix event namelist to duplicate string Masami Hiramatsu
2009-12-07 17:37   ` tip-bot for Masami Hiramatsu [this message]
2009-12-07 17:00 ` [BUGFIX PATCH -tip 4/5] perf probe: Check e_snprintf() format string Masami Hiramatsu
2009-12-07 17:37   ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-07 17:00 ` [BUGFIX PATCH -tip 5/5] perf probe: Use pr_debug for debug message Masami Hiramatsu
2009-12-07 17:37   ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-e1d2017b24fb31602f1128e6a8b2afc54c9283cd@git.kernel.org \
    --to=mhiramat@redhat.com \
    --cc=acme@redhat.com \
    --cc=dle-develop@lists.sourceforge.net \
    --cc=fweisbec@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@redhat.com \
    --cc=systemtap@sources.redhat.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox