[tip:tracing/core] tracing/filters: add missing unlock in a failure path
From: tip-bot for Li Zefan
Date: Fri May 15 2009 - 10:43:37 EST
Commit-ID: 8cd995b6deedf98b7694ed32a786ee7f793d1eec
Gitweb: http://git.kernel.org/tip/8cd995b6deedf98b7694ed32a786ee7f793d1eec
Author: Li Zefan <lizf@xxxxxxxxxxxxxx>
AuthorDate: Fri, 15 May 2009 11:07:27 +0800
Committer: Steven Rostedt <rostedt@xxxxxxxxxxx>
CommitDate: Thu, 14 May 2009 23:55:10 -0400
tracing/filters: add missing unlock in a failure path
[ Impact: fix deadlock in a rare case we fail to allocate memory ]
Signed-off-by: Li Zefan <lizf@xxxxxxxxxxxxxx>
LKML-Reference: <4A0CDC6F.7070200@xxxxxxxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
---
kernel/trace/trace_events_filter.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 85ad6a8..22c2998 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -1079,9 +1079,10 @@ int apply_event_filter(struct ftrace_event_call *call, char *filter_string)
return 0;
}
+ err = -ENOMEM;
ps = kzalloc(sizeof(*ps), GFP_KERNEL);
if (!ps)
- return -ENOMEM;
+ goto out_unlock;
filter_disable_preds(call);
replace_filter_string(call->filter, filter_string);
@@ -1101,7 +1102,7 @@ out:
filter_opstack_clear(ps);
postfix_clear(ps);
kfree(ps);
-
+out_unlock:
mutex_unlock(&filter_mutex);
return err;
@@ -1123,9 +1124,10 @@ int apply_subsystem_event_filter(struct event_subsystem *system,
return 0;
}
+ err = -ENOMEM;
ps = kzalloc(sizeof(*ps), GFP_KERNEL);
if (!ps)
- return -ENOMEM;
+ goto out_unlock;
filter_free_subsystem_preds(system);
replace_filter_string(system->filter, filter_string);
@@ -1145,7 +1147,7 @@ out:
filter_opstack_clear(ps);
postfix_clear(ps);
kfree(ps);
-
+out_unlock:
mutex_unlock(&filter_mutex);
return err;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/