iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tracing/filters: add missing unlock in a failure path

Browse Source 
[ Impact: fix deadlock in a rare case we fail to allocate memory ]

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4A0CDC6F.7070200@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Li Zefan 2009-05-15 11:07:27 +08:00 committed by Steven Rostedt
parent 1ec7c4849c
commit 8cd995b6de
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/trace/trace_events_filter.c
View File

@ -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;