Skip to content

Commit

Permalink
perf, x86: Fix silly bug in data store buffer allocation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Mar 10, 2010
1 parent 30a813a commit 3adaebd
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions arch/x86/kernel/cpu/perf_event_intel_ds.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,8 @@ static int reserve_ds_buffers(void)

err = -ENOMEM;
ds = kzalloc(sizeof(*ds), GFP_KERNEL);
if (unlikely(!ds)) {
kfree(buffer);
if (unlikely(!ds))
break;
}
per_cpu(cpu_hw_events, cpu).ds = ds;

if (x86_pmu.bts) {
Expand Down

0 comments on commit 3adaebd

Please sign in to comment.