Commit cbc51cc4 authored by Artem Savkov's avatar Artem Savkov Committed by Kleber Sacilotto de Souza

tracing/kprobes: Fix trace_probe flags on enable_trace_kprobe() failure

BugLink: https://bugs.launchpad.net/bugs/1791953

commit 57ea2a34 upstream.

If enable_trace_kprobe fails to enable the probe in enable_k(ret)probe
it returns an error, but does not unset the tp flags it set previously.
This results in a probe being considered enabled and failures like being
unable to remove the probe through kprobe_events file since probes_open()
expects every probe to be disabled.

Link: http://lkml.kernel.org/r/20180725102826.8300-1-asavkov@redhat.com
Link: http://lkml.kernel.org/r/20180725142038.4765-1-asavkov@redhat.com

Cc: Ingo Molnar <mingo@redhat.com>
Cc: stable@vger.kernel.org
Fixes: 41a7dd42 ("tracing/kprobes: Support ftrace_event_file base multibuffer")
Acked-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Reviewed-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: default avatarArtem Savkov <asavkov@redhat.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent be433378
...@@ -349,11 +349,10 @@ static struct trace_kprobe *find_trace_kprobe(const char *event, ...@@ -349,11 +349,10 @@ static struct trace_kprobe *find_trace_kprobe(const char *event,
static int static int
enable_trace_kprobe(struct trace_kprobe *tk, struct trace_event_file *file) enable_trace_kprobe(struct trace_kprobe *tk, struct trace_event_file *file)
{ {
struct event_file_link *link;
int ret = 0; int ret = 0;
if (file) { if (file) {
struct event_file_link *link;
link = kmalloc(sizeof(*link), GFP_KERNEL); link = kmalloc(sizeof(*link), GFP_KERNEL);
if (!link) { if (!link) {
ret = -ENOMEM; ret = -ENOMEM;
...@@ -373,6 +372,16 @@ enable_trace_kprobe(struct trace_kprobe *tk, struct trace_event_file *file) ...@@ -373,6 +372,16 @@ enable_trace_kprobe(struct trace_kprobe *tk, struct trace_event_file *file)
else else
ret = enable_kprobe(&tk->rp.kp); ret = enable_kprobe(&tk->rp.kp);
} }
if (ret) {
if (file) {
list_del_rcu(&link->list);
kfree(link);
tk->tp.flags &= ~TP_FLAG_TRACE;
} else {
tk->tp.flags &= ~TP_FLAG_PROFILE;
}
}
out: out:
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment