diff options
author | zhangwei(Jovi) <jovi.zhangwei@huawei.com> | 2014-04-17 10:05:19 +0200 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2014-04-17 16:44:42 +0200 |
commit | 6ea6215fe394e320468589d9bba464a48f6d823a (patch) | |
tree | 29c2c207b7fbba870b61708e7c717acadd4dbbb2 /kernel | |
parent | tracing: Do not try to recreated toplevel set_ftrace_* files (diff) | |
download | linux-6ea6215fe394e320468589d9bba464a48f6d823a.tar.xz linux-6ea6215fe394e320468589d9bba464a48f6d823a.zip |
tracing/uprobes: Fix uprobe_cpu_buffer memory leak
Forgot to free uprobe_cpu_buffer percpu page in uprobe_buffer_disable().
Link: http://lkml.kernel.org/p/534F8B3F.1090407@huawei.com
Cc: stable@vger.kernel.org # v3.14+
Acked-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: zhangwei(Jovi) <jovi.zhangwei@huawei.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/trace/trace_uprobe.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 930e51462dc8..c082a7441345 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -732,9 +732,15 @@ static int uprobe_buffer_enable(void) static void uprobe_buffer_disable(void) { + int cpu; + BUG_ON(!mutex_is_locked(&event_mutex)); if (--uprobe_buffer_refcnt == 0) { + for_each_possible_cpu(cpu) + free_page((unsigned long)per_cpu_ptr(uprobe_cpu_buffer, + cpu)->buf); + free_percpu(uprobe_cpu_buffer); uprobe_cpu_buffer = NULL; } |