[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-d24d7dbf3cc49b00a152e55e24f0eeb173c7a971@git.kernel.org>
Date: Thu, 24 Jan 2013 11:37:14 -0800
From: tip-bot for Jovi Zhang <bookjovi@...il.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
rostedt@...dmis.org, srikar@...ux.vnet.ibm.com, tglx@...utronix.de,
namhyung@...nel.org, bookjovi@...il.com
Subject: [tip:perf/core] tracing:
Verify target file before registering a uprobe event
Commit-ID: d24d7dbf3cc49b00a152e55e24f0eeb173c7a971
Gitweb: http://git.kernel.org/tip/d24d7dbf3cc49b00a152e55e24f0eeb173c7a971
Author: Jovi Zhang <bookjovi@...il.com>
AuthorDate: Wed, 18 Jul 2012 18:16:44 +0800
Committer: Steven Rostedt <rostedt@...dmis.org>
CommitDate: Mon, 21 Jan 2013 13:22:31 -0500
tracing: Verify target file before registering a uprobe event
Without this patch, we can register a uprobe event for a directory.
Enabling such a uprobe event would anyway fail.
Example:
$ echo 'p /bin:0x4245c0' > /sys/kernel/debug/tracing/uprobe_events
However dirctories cannot be valid targets for uprobe.
Hence verify if the target is a regular file during the probe
registration.
Link: http://lkml.kernel.org/r/20130103004212.690763002@goodmis.org
Cc: Namhyung Kim <namhyung@...nel.org>
Signed-off-by: Jovi Zhang <bookjovi@...il.com>
Acked-by: Srikar Dronamraju <srikar@...ux.vnet.ibm.com>
[ cleaned up whitespace and removed redundant IS_DIR() check ]
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
---
kernel/trace/trace_uprobe.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index c86e6d4..87b6db4 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -258,6 +258,10 @@ static int create_trace_uprobe(int argc, char **argv)
goto fail_address_parse;
inode = igrab(path.dentry->d_inode);
+ if (!S_ISREG(inode->i_mode)) {
+ ret = -EINVAL;
+ goto fail_address_parse;
+ }
argc -= 2;
argv += 2;
@@ -356,7 +360,7 @@ fail_address_parse:
if (inode)
iput(inode);
- pr_info("Failed to parse address.\n");
+ pr_info("Failed to parse address or file.\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