[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-a9bb18f36c8056f0712fb28c52c0f85d98438dfb@git.kernel.org>
Date: Sun, 14 Feb 2010 09:13:35 GMT
From: tip-bot for Heiko Carstens <heiko.carstens@...ibm.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
fweisbec@...il.com, rostedt@...dmis.org, heiko.carstens@...ibm.com,
tglx@...utronix.de, mhiramat@...hat.com, mingo@...e.hu
Subject: [tip:tracing/urgent] tracing/kprobes: Fix probe parsing
Commit-ID: a9bb18f36c8056f0712fb28c52c0f85d98438dfb
Gitweb: http://git.kernel.org/tip/a9bb18f36c8056f0712fb28c52c0f85d98438dfb
Author: Heiko Carstens <heiko.carstens@...ibm.com>
AuthorDate: Wed, 10 Feb 2010 17:23:47 +0100
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Sun, 14 Feb 2010 09:43:58 +0100
tracing/kprobes: Fix probe parsing
Trying to add a probe like:
echo p:myprobe 0x10000 > /sys/kernel/debug/tracing/kprobe_events
will fail since the wrong pointer is passed to strict_strtoul
when trying to convert the address to an unsigned long.
Signed-off-by: Heiko Carstens <heiko.carstens@...ibm.com>
Acked-by: Masami Hiramatsu <mhiramat@...hat.com>
Cc: Frederic Weisbecker <fweisbec@...il.com>
Cc: Steven Rostedt <rostedt@...dmis.org>
LKML-Reference: <20100210162346.GA6933@...ris.boeblingen.de.ibm.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
kernel/trace/trace_kprobe.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 6ea90c0..50b1b82 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -689,7 +689,7 @@ static int create_trace_probe(int argc, char **argv)
return -EINVAL;
}
/* an address specified */
- ret = strict_strtoul(&argv[0][2], 0, (unsigned long *)&addr);
+ ret = strict_strtoul(&argv[1][0], 0, (unsigned long *)&addr);
if (ret) {
pr_info("Failed to parse address.\n");
return ret;
--
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