summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-05-01 10:11:35 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-12 14:57:05 -0700
commitef0c64308b5dfa779b0c22508ad755abe49938ac (patch)
tree52b2d4fadbb1a74804eab1fdf8b503663f0c956b
parent16520f3baf29ad9cfdcd5503262f4043813e4686 (diff)
perf: Fix resource leak in failure path of perf_event_open()
commit 048c852051d2bd5da54a4488bc1f16b0fc74c695 upstream. perf_event_open() kfrees event after init failure which doesn't release all resources allocated by perf_event_alloc(). Use free_event() instead. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Paul Mackerras <paulus@au1.ibm.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> LKML-Reference: <4BDBE237.1040809@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--kernel/perf_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 447e8db3e4ed..72df1eb48282 100644
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -4609,7 +4609,7 @@ err_fput_free_put_context:
err_free_put_context:
if (err < 0)
- kfree(event);
+ free_event(event);
err_put_context:
if (err < 0)