summaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@redhat.com>2013-01-28 17:08:47 +0100
committerOleg Nesterov <oleg@redhat.com>2013-02-08 18:24:14 +0100
commit7e4e28c53963e6cfa94d8109bb8f5233c5659048 (patch)
tree5405bc0552ef0f2d8c67bb9ef6b391f5a7a504b3 /kernel/trace
parent4161824f18ff4f56f46595a4016c7315dd0d24f1 (diff)
downloadop-kernel-dev-7e4e28c53963e6cfa94d8109bb8f5233c5659048.zip
op-kernel-dev-7e4e28c53963e6cfa94d8109bb8f5233c5659048.tar.gz
uprobes/tracing: Ensure inode != NULL in create_trace_uprobe()
probe_event_enable/disable() check tu->inode != NULL at the start. This is ugly, if igrab() can fail create_trace_uprobe() should not succeed and "postpone" the failure. And S_ISREG(inode->i_mode) check added by d24d7dbf is not safe. Note: alloc_uprobe() should probably check igrab() != NULL as well. Signed-off-by: Oleg Nesterov <oleg@redhat.com> Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/trace_uprobe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 15b8ece..f7838cf 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -256,7 +256,7 @@ static int create_trace_uprobe(int argc, char **argv)
inode = igrab(path.dentry->d_inode);
path_put(&path);
- if (!S_ISREG(inode->i_mode)) {
+ if (!inode || !S_ISREG(inode->i_mode)) {
ret = -EINVAL;
goto fail_address_parse;
}
@@ -544,7 +544,7 @@ static int probe_event_enable(struct trace_uprobe *tu, int flag)
struct uprobe_trace_consumer *utc;
int ret = 0;
- if (!tu->inode || tu->consumer)
+ if (tu->consumer)
return -EINTR;
utc = kzalloc(sizeof(struct uprobe_trace_consumer), GFP_KERNEL);
@@ -568,7 +568,7 @@ static int probe_event_enable(struct trace_uprobe *tu, int flag)
static void probe_event_disable(struct trace_uprobe *tu, int flag)
{
- if (!tu->inode || !tu->consumer)
+ if (!tu->consumer)
return;
uprobe_unregister(tu->inode, tu->offset, &tu->consumer->cons);
OpenPOWER on IntegriCloud