From c8ca003b2fde177b83de87f9f20f6a5933fb50bf Mon Sep 17 00:00:00 2001 From: Chunyu Hu Date: Mon, 14 Mar 2016 20:35:41 +0800 Subject: 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 Signed-off-by: Chunyu Hu Signed-off-by: Steven Rostedt --- kernel/trace/trace.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'kernel') 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 -- cgit v1.2.3-59-g8ed1b