perf_events: Fix resource leak in x86 __hw_perf_event_init()

[karo-tx-linux.git] / arch / x86 / kernel / cpu / perf_event.c

diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index efea222b0351433b980ea42e485ecf30c5c6bc16..0ff02cae710b55bc190f3f921972bad704478aed 100644 (file)
--- 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);