lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 30 Nov 2009 19:19:43 -0500 From: Masami Hiramatsu <mhiramat@...hat.com> To: Ingo Molnar <mingo@...e.hu>, Frederic Weisbecker <fweisbec@...il.com>, lkml <linux-kernel@...r.kernel.org> Cc: systemtap <systemtap@...rces.redhat.com>, DLE <dle-develop@...ts.sourceforge.net>, Masami Hiramatsu <mhiramat@...hat.com>, Ingo Molnar <mingo@...e.hu>, Steven Rostedt <rostedt@...dmis.org>, Jim Keniston <jkenisto@...ibm.com>, Ananth N Mavinakayanahalli <ananth@...ibm.com>, Christoph Hellwig <hch@...radead.org>, "Frank Ch. Eigler" <fche@...hat.com>, Frederic Weisbecker <fweisbec@...il.com>, Jason Baron <jbaron@...hat.com>, "K.Prasad" <prasad@...ux.vnet.ibm.com>, Peter Zijlstra <peterz@...radead.org>, Srikar Dronamraju <srikar@...ux.vnet.ibm.com>, Arnaldo Carvalho de Melo <acme@...hat.com> Subject: [PATCH -tip 4/9] perf probe: Fix argv array size in probe parser Since the syntax had been changed, probe definition needs parameters less than MAX_PROBE_ARGS + 1 (probe-point + arguments). Signed-off-by: Masami Hiramatsu <mhiramat@...hat.com> Cc: Ingo Molnar <mingo@...e.hu> Cc: Steven Rostedt <rostedt@...dmis.org> Cc: Jim Keniston <jkenisto@...ibm.com> Cc: Ananth N Mavinakayanahalli <ananth@...ibm.com> Cc: Christoph Hellwig <hch@...radead.org> Cc: Frank Ch. Eigler <fche@...hat.com> Cc: Frederic Weisbecker <fweisbec@...il.com> Cc: Jason Baron <jbaron@...hat.com> Cc: K.Prasad <prasad@...ux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@...radead.org> Cc: Srikar Dronamraju <srikar@...ux.vnet.ibm.com> Cc: Arnaldo Carvalho de Melo <acme@...hat.com> --- tools/perf/builtin-probe.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c index 4e418af..510fdd4 100644 --- a/tools/perf/builtin-probe.c +++ b/tools/perf/builtin-probe.c @@ -151,7 +151,7 @@ static void parse_probe_point(char *arg, struct probe_point *pp) /* Parse an event definition. Note that any error must die. */ static void parse_probe_event(const char *str) { - char *argv[MAX_PROBE_ARGS + 2]; /* Event + probe + args */ + char *argv[MAX_PROBE_ARGS + 1]; /* probe + args */ int argc, i; struct probe_point *pp = &session.probes[session.nr_probe]; @@ -169,6 +169,9 @@ static void parse_probe_event(const char *str) /* Add an argument */ if (*str != '\0') { const char *s = str; + /* Check the limit number of arguments */ + if (argc == MAX_PROBE_ARGS + 1) + semantic_error("Too many arguments"); /* Skip the argument */ while (!isspace(*str) && *str != '\0') @@ -178,9 +181,9 @@ static void parse_probe_event(const char *str) argv[argc] = strndup(s, str - s); if (argv[argc] == NULL) die("strndup"); - if (++argc == MAX_PROBE_ARGS) - semantic_error("Too many arguments"); - pr_debug("argv[%d]=%s\n", argc, argv[argc - 1]); + pr_debug("argv[%d]=%s\n", argc, argv[argc]); + argc++; + } } while (*str != '\0'); if (!argc) -- Masami Hiramatsu Software Engineer Hitachi Computer Products (America), Inc. Software Solutions Division e-mail: mhiramat@...hat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists