[tip:perf/pebs] perf, x86: Fix silly bug in data store buffer allocation
in [Kernel]
|
Prev: [tip:perf/pebs] perf, x86: Expose the full PEBS record using PERF_SAMPLE_RAW
Next: [tip:perf/pebs] perf, x86: Disable PEBS on clovertown chips
From: tip-bot for Peter Zijlstra on 10 Mar 2010 08:30 Commit-ID: 3adaebd69557615c1bf0365ce5e32d93ac7d82af Gitweb: http://git.kernel.org/tip/3adaebd69557615c1bf0365ce5e32d93ac7d82af Author: Peter Zijlstra <a.p.zijlstra(a)chello.nl> AuthorDate: Fri, 5 Mar 2010 12:09:29 +0100 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Wed, 10 Mar 2010 13:23:34 +0100 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(a)chello.nl> Cc: Arnaldo Carvalho de Melo <acme(a)infradead.org> Cc: paulus(a)samba.org Cc: eranian(a)google.com Cc: robert.richter(a)amd.com Cc: fweisbec(a)gmail.com LKML-Reference: <20100305154128.813452402(a)chello.nl> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- arch/x86/kernel/cpu/perf_event_intel_ds.c | 4 +--- 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 72453ac..a67fff1 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) 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) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |