Skip to content

Commit

Permalink
uprobes/tracing: Fix uprobe_perf_open() on uprobe_apply() failure
Browse files Browse the repository at this point in the history
uprobe_perf_open()->uprobe_apply() can fail, but this error is wrongly
ignored. Change uprobe_perf_open() to do uprobe_perf_close() and return
the error code in this case.

Change uprobe_perf_close() to propogate the error from uprobe_apply()
as well, although it should not fail.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
  • Loading branch information
Oleg Nesterov committed Apr 30, 2014
1 parent ce5f36a commit 927d687
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions kernel/trace/trace_uprobe.c
Original file line number Diff line number Diff line change
Expand Up @@ -1026,14 +1026,15 @@ static int uprobe_perf_close(struct trace_uprobe *tu, struct perf_event *event)
write_unlock(&tu->filter.rwlock);

if (!done)
uprobe_apply(tu->inode, tu->offset, &tu->consumer, false);
return uprobe_apply(tu->inode, tu->offset, &tu->consumer, false);

return 0;
}

static int uprobe_perf_open(struct trace_uprobe *tu, struct perf_event *event)
{
bool done;
int err;

write_lock(&tu->filter.rwlock);
if (event->hw.tp_target) {
Expand All @@ -1055,10 +1056,13 @@ static int uprobe_perf_open(struct trace_uprobe *tu, struct perf_event *event)
}
write_unlock(&tu->filter.rwlock);

if (!done)
uprobe_apply(tu->inode, tu->offset, &tu->consumer, true);

return 0;
err = 0;
if (!done) {
err = uprobe_apply(tu->inode, tu->offset, &tu->consumer, true);
if (err)
uprobe_perf_close(tu, event);
}
return err;
}

static bool uprobe_perf_filter(struct uprobe_consumer *uc,
Expand Down

0 comments on commit 927d687

Please sign in to comment.