summaryrefslogtreecommitdiff
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorChunyu Hu <chuhu@redhat.com>2016-03-14 20:35:41 +0800
committerSteven Rostedt <rostedt@goodmis.org>2016-03-18 10:36:21 -0400
commitc8ca003b2fde177b83de87f9f20f6a5933fb50bf (patch)
tree05f03d5ecb63b05c86a4846902b2d7b05731cc29 /kernel/trace/trace.c
parent6363c6b599ae67b779d01a48642a7c0d7d721814 (diff)
tracing: Fix return while holding a lock in register_tracer()
commit d39cdd2036a6 ("tracing: Make tracer_flags use the right set_flag callback") introduces a potential mutex deadlock issue, as it forgets to free the mutex when allocaing the tracer_flags gets fail. The issue was found by Dan Carpenter through Smatch static code check tool. Link: http://lkml.kernel.org/r/1457958941-30265-1-git-send-email-chuhu@redhat.com Fixes: d39cdd2036a6 ("tracing: Make tracer_flags use the right set_flag callback") Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Chunyu Hu <chuhu@redhat.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r--kernel/trace/trace.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index b401a1892dc6..0ae46048f724 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1256,8 +1256,10 @@ int __init register_tracer(struct tracer *type)
if (!type->flags) {
/*allocate a dummy tracer_flags*/
type->flags = kmalloc(sizeof(*type->flags), GFP_KERNEL);
- if (!type->flags)
- return -ENOMEM;
+ if (!type->flags) {
+ ret = -ENOMEM;
+ goto out;
+ }
type->flags->val = 0;
type->flags->opts = dummy_tracer_opt;
} else