Commit-ID: 964baffc6f14ece601c417f9a94c8dbcdd5c97a2
Author: Stephane Eranian <eran...@google.com>
AuthorDate: Wed, 17 Mar 2010 23:21:01 +0200
Commit: Greg Kroah-Hartman <Greg Kroah-Hartman>
CommitDate: Mon, 5 Jul 2010 11:11:04 -0700
perf_events: Fix resource leak in x86 __hw_perf_event_init()
commit 4b24a88b35e15e04bd8f2c5dda65b5dc8ebca05f upstream.
If reserve_pmc_hardware() succeeds but reserve_ds_buffers()
fails, then we need to release_pmc_hardware. It won't be done
by the destroy() callback because we return before setting it
in case of error.
Signed-off-by: Stephane Eranian <eran...@google.com>
Cc: pet...@infradead.org
Cc: pau...@samba.org
Cc: da...@davemloft.net
Cc: fweis...@gmail.com
Cc: robert.rich...@amd.com
Cc: perfmon2-de...@lists.sf.net
LKML-Reference: <4ba1568b.15185e0a.182a.7...@mx.google.com>
Signed-off-by: Ingo Molnar <mi...@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>
---
arch/x86/kernel/cpu/perf_event.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index efea222..0ff02ca 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1005,8 +1005,11 @@ static int __hw_perf_event_init(struct perf_event *event)
if (atomic_read(&active_events) == 0) {
if (!reserve_pmc_hardware())
err = -EBUSY;
- else
+ else {
err = reserve_bts_hardware();
+ if (err)
+ release_pmc_hardware();
+ }
}
if (!err)
atomic_inc(&active_events);
--
1.7.1.1
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
perfmon2-devel mailing list
perfmon2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/perfmon2-devel
