aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJovi Zhang <bookjovi@gmail.com>2012-07-18 06:16:44 -0400
committerSteven Rostedt <rostedt@goodmis.org>2013-01-21 13:22:31 -0500
commitd24d7dbf3cc49b00a152e55e24f0eeb173c7a971 (patch)
tree9438ef9d1b6123f5d0b5f66e99a1f3774bce274f /kernel
parentd8a0349c0cea477322c66ea9362f10c62fad5f62 (diff)
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@kernel.org> Signed-off-by: Jovi Zhang <bookjovi@gmail.com> Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> [ cleaned up whitespace and removed redundant IS_DIR() check ] Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_uprobe.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index c86e6d4f67fb..87b6db4ccbc5 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)
258 goto fail_address_parse; 258 goto fail_address_parse;
259 259
260 inode = igrab(path.dentry->d_inode); 260 inode = igrab(path.dentry->d_inode);
261 if (!S_ISREG(inode->i_mode)) {
262 ret = -EINVAL;
263 goto fail_address_parse;
264 }
261 265
262 argc -= 2; 266 argc -= 2;
263 argv += 2; 267 argv += 2;
@@ -356,7 +360,7 @@ fail_address_parse:
356 if (inode) 360 if (inode)
357 iput(inode); 361 iput(inode);
358 362
359 pr_info("Failed to parse address.\n"); 363 pr_info("Failed to parse address or file.\n");
360 364
361 return ret; 365 return ret;
362} 366}