Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84988450 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

perf probe: Check e_snprintf() format string 



Check e_snprintf() format string by gcc, and fix a bug of
e_snprintf() caller.

Signed-off-by: default avatarMasami 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: <20091207170053.19230.7690.stgit@dhcp-100-2-132.bos.redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e1d2017b

tools/perf/util/probe-event.c

+4 −1
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ 
#define semantic_error(msg ...) die("Semantic error :" msg)



/* If there is no space to write, returns -E2BIG. */

static int e_snprintf(char *str, size_t size, const char *format, ...)

	__attribute__((format(printf, 3, 4)));



static int e_snprintf(char *str, size_t size, const char *format, ...)

{

	int ret;
@@ -258,7 +261,7 @@ int synthesize_perf_probe_event(struct probe_point *pp) 
		ret = e_snprintf(buf, MAX_CMDLEN, "%s%s%s%s", pp->function,

				 offs, pp->retprobe ? "%return" : "", line);

	else

		ret = e_snprintf(buf, MAX_CMDLEN, "%s%s%s%s", pp->file, line);

		ret = e_snprintf(buf, MAX_CMDLEN, "%s%s", pp->file, line);

	if (ret <= 0)

		goto error;

	len = ret;