diff options
| author |   Oleg Nesterov <oleg@redhat.com> | 2014-07-11 21:06:38 +0200 |
|---|---|---|
| committer |   Steven Rostedt <rostedt@goodmis.org> | 2014-07-14 14:41:13 -0400 |
| commit | 2448e3493cb3874baa90725c87869455ebf11cd2 (patch) | |
| tree | dfbcb7c632b741b5ca5b02b459ad4aacff14bb89 /kernel/trace/trace_events.c | |
| parent | Linux 3.16-rc5 (diff) | |
| download | linux-dev-2448e3493cb3874baa90725c87869455ebf11cd2.tar.xz linux-dev-2448e3493cb3874baa90725c87869455ebf11cd2.zip | |
tracing: instance_rmdir() leaks ftrace_event_file->filter
instance_rmdir() path destroys the event files but forgets to free
file->filter. Change remove_event_file_dir() to free_event_filter().
Link: http://lkml.kernel.org/p/20140711190638.GA19517@redhat.com
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Tom Zanussi <tom.zanussi@linux.intel.com>
Cc: "zhangwei(Jovi)" <jovi.zhangwei@huawei.com>
Cc: stable@vger.kernel.org # 3.11+
Fixes: f6a84bdc75b5 "tracing: Introduce remove_event_file_dir()"
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace_events.c')
| -rw-r--r-- | kernel/trace/trace_events.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index f99e0b3bca8c..2de53628689f 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -470,6 +470,7 @@ static void remove_event_file_dir(struct ftrace_event_file *file) list_del(&file->list); remove_subsystem(file->system); + free_event_filter(file->filter); kmem_cache_free(file_cachep, file); } |