path: root/kernel
diff options
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2013-05-09 11:30:26 -0400
committerSteven Rostedt <rostedt@goodmis.org>2013-05-09 11:30:26 -0400
commitff305ded9ff83436039a16d31bc558dc6598d7ce (patch)
tree5430dd02b415b7b688a0579a5fff67c41dc4331b /kernel
parenta5b85bd1557209b4ef18a8cf07e60a1ca3132468 (diff)
tracing: Return error if register_ftrace_function_probe() fails for event_enable_func()
register_ftrace_function_probe() returns the number of functions it registered, which can be zero, it can also return a negative number if something went wrong. But event_enable_func() only checks for the case that it didn't register anything, it needs to also check for the case that something went wrong and return that error code as well. Added some comments about the code as well, to make it more understandable. Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
1 files changed, 9 insertions, 2 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 44ac83614c3d..87e826f1c237 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -2061,11 +2061,18 @@ event_enable_func(struct ftrace_hash *hash,
if (ret < 0)
goto out_put;
ret = register_ftrace_function_probe(glob, ops, data);
+ /*
+ * The above returns on success the # of functions enabled,
+ * but if it didn't find any functions it returns zero.
+ * Consider no functions a failure too.
+ */
if (!ret) {
ret = -ENOENT;
goto out_disable;
- } else
- ret = 0;
+ } else if (ret < 0)
+ goto out_disable;
+ /* Just return zero, not the number of enabled functions */
+ ret = 0;
return ret;