[PATCH] perf_events: fix resource leak in x86 __hw_perf_event_init()

From: Stephane Eranian <eranian@google.com>
To: linux-kernel@vger.kernel.org
Cc: peterz@infradead.org, mingo@elte.hu, paulus@samba.org,
	davem@davemloft.net, fweisbec@gmail.com, robert.richter@amd.com,
	perfmon2-devel@lists.sf.net, eranian@gmail.com,
	eranian@google.com
Subject: [PATCH] perf_events: fix resource leak in x86 __hw_perf_event_init()
Date: Wed, 17 Mar 2010 23:21:01 +0200	[thread overview]
Message-ID: <4ba1568b.15185e0a.182a.7802@mx.google.com> (raw)

	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 <eranian@google.com>

--
 perf_event.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 978d297..8d9b152 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -455,8 +455,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_ds_buffers();
+				if (err)
+					release_pmc_hardware();
+			}
 		}
 		if (!err)
 			atomic_inc(&active_events);
