Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00d1d0b0 authored by Stephane Eranian's avatar Stephane Eranian Committed by Ingo Molnar
Browse files

perf: Fix errors path in perf_output_begin()



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: default avatarStephane Eranian <eranian@google.com>
Signed-off-by: default avatarPeter 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: default avatarIngo Molnar <mingo@elte.hu>
parent 4f41c013
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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)