aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-03-05 06:09:29 -0500
committerIngo Molnar <mingo@elte.hu>2010-03-10 07:23:34 -0500
commit3adaebd69557615c1bf0365ce5e32d93ac7d82af (patch)
treea48b45a3647d97a0239ae291827a078e9a2e493a /arch
parent30a813ae035d3e220a89609adce878e045c49547 (diff)
perf, x86: Fix silly bug in data store buffer allocation
Fix up the ds allocation error path, where we could free @buffer before we used it. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Arnaldo Carvalho de Melo <acme@infradead.org> Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: <20100305154128.813452402@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/cpu/perf_event_intel_ds.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c
index 72453ac5fb7d..a67fff14475e 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c
@@ -127,10 +127,8 @@ static int reserve_ds_buffers(void)
127 127
128 err = -ENOMEM; 128 err = -ENOMEM;
129 ds = kzalloc(sizeof(*ds), GFP_KERNEL); 129 ds = kzalloc(sizeof(*ds), GFP_KERNEL);
130 if (unlikely(!ds)) { 130 if (unlikely(!ds))
131 kfree(buffer);
132 break; 131 break;
133 }
134 per_cpu(cpu_hw_events, cpu).ds = ds; 132 per_cpu(cpu_hw_events, cpu).ds = ds;
135 133
136 if (x86_pmu.bts) { 134 if (x86_pmu.bts) {