Skip to content

Commit

Permalink
uprobes/tracing: Ensure inode != NULL in create_trace_uprobe()
Browse files Browse the repository at this point in the history
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 d24d7db 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>
  • Loading branch information
Oleg Nesterov committed Feb 8, 2013
1 parent 4161824 commit 7e4e28c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions kernel/trace/trace_uprobe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit 7e4e28c

Please sign in to comment.