Ver código fonte

perf probe: Fix probe_point buffer overrun

Fix probe_point array-size overrun problem. In some cases (e.g.
inline function), one user-specified probe-point can be
translated to many probe address, and it overruns pre-defined
array-size. This also removes redundant MAX_PROBES macro
definition.

Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: systemtap <systemtap@sources.redhat.com>
Cc: DLE <dle-develop@lists.sourceforge.net>
Cc: <stable@kernel.org>
LKML-Reference: <20100312232217.2017.45017.stgit@localhost6.localdomain6>
[ Note that only root can create new probes. Eventually we should remove
  the MAX_PROBES limit, but that is a larger patch not eligible to
  perf/urgent treatment. ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Masami Hiramatsu 15 anos atrás
pai
commit
594087a04e
2 arquivos alterados com 3 adições e 1 exclusões
  1. 0 1
      tools/perf/builtin-probe.c
  2. 3 0
      tools/perf/util/probe-finder.c

+ 0 - 1
tools/perf/builtin-probe.c

@@ -47,7 +47,6 @@
 #include "util/probe-event.h"
 #include "util/probe-event.h"
 
 
 #define MAX_PATH_LEN 256
 #define MAX_PATH_LEN 256
-#define MAX_PROBES 128
 
 
 /* Session management structure */
 /* Session management structure */
 static struct {
 static struct {

+ 3 - 0
tools/perf/util/probe-finder.c

@@ -455,6 +455,9 @@ static void show_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf)
 	/* *pf->fb_ops will be cached in libdw. Don't free it. */
 	/* *pf->fb_ops will be cached in libdw. Don't free it. */
 	pf->fb_ops = NULL;
 	pf->fb_ops = NULL;
 
 
+	if (pp->found == MAX_PROBES)
+		die("Too many( > %d) probe point found.\n", MAX_PROBES);
+
 	pp->probes[pp->found] = strdup(tmp);
 	pp->probes[pp->found] = strdup(tmp);
 	pp->found++;
 	pp->found++;
 }
 }