forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uprobes/tracing: Ensure inode != NULL in create_trace_uprobe()

Browse source 
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>
This commit is contained in:
Oleg Nesterov 2013-01-28 17:08:47 +01:00
parent 4161824f18
commit 7e4e28c539
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/trace/trace_uprobe.c
View file

@ -256,7 +256,7 @@ static int create_trace_uprobe(int argc, char **argv)
inode = igrab(path.dentry->d_inode); inode = igrab(path.dentry->d_inode);
path_put(&path); path_put(&path);
if (!S_ISREG(inode->i_mode)) { if (!inode || !S_ISREG(inode->i_mode)) {
ret = -EINVAL; ret = -EINVAL;
goto fail_address_parse; goto fail_address_parse;
} }
@ -544,7 +544,7 @@ static int probe_event_enable(struct trace_uprobe *tu, int flag)
struct uprobe_trace_consumer *utc; struct uprobe_trace_consumer *utc;
int ret = 0; int ret = 0;
if (!tu->inode || tu->consumer) if (tu->consumer)
return -EINTR; return -EINTR;
utc = kzalloc(sizeof(struct uprobe_trace_consumer), GFP_KERNEL); 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) static void probe_event_disable(struct trace_uprobe *tu, int flag)
{ {
if (!tu->inode || !tu->consumer) if (!tu->consumer)
return; return;
uprobe_unregister(tu->inode, tu->offset, &tu->consumer->cons); uprobe_unregister(tu->inode, tu->offset, &tu->consumer->cons);