perf: Fix errors path in perf_output_begin()
authorStephane Eranian <eranian@google.com>
Mon, 17 May 2010 10:46:01 +0000 (12:46 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 18 May 2010 16:35:47 +0000 (18:35 +0200)
In case the sampling buffer has no "payload" pages,
nr_pages is 0. The problem is that the error path in
perf_output_begin() skips to a label which assumes
perf_output_lock() has been issued which is not the
case. That triggers a WARN_ON() in
perf_output_unlock().

This patch fixes the problem by skipping
perf_output_unlock() in case data->nr_pages is 0.

Signed-off-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <4bf13674.014fd80a.6c82.ffffb20c@mx.google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/perf_event.c

index 17ac47f4bce69eda21cd07de2bcade79ec9a5df0..8d61d292f7190b6650a15d614f916b500f7a9e9a 100644 (file)
@@ -3036,7 +3036,7 @@ int perf_output_begin(struct perf_output_handle *handle,
        handle->sample  = sample;
 
        if (!data->nr_pages)
-               goto fail;
+               goto out;
 
        have_lost = atomic_read(&data->lost);
        if (have_lost)