Skip to contentSkip to conversation

perf_events: fix errors path in perf_output_begin() (take 3)

PATCH In review Stephane Eranian 1 participant 2 messages May 17, 2010 – May 18, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf_events: fix errors path in perf_output_begin() (take 3)

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.

--

kernel/perf_event.c +1 -1
index a4fa381..4fdb919 100644
@@ -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)
#1 lore raw

[tip:perf/core] perf: Fix errors path in perf_output_begin()

Commit-ID:  00d1d0b095ba4e5c0958cb228b2a9c445d4a339d
Gitweb:     http://git.kernel.org/tip/00d1d0b095ba4e5c0958cb228b2a9c445d4a339d
Author:     Stephane Eranian <[email protected]>
AuthorDate: Mon, 17 May 2010 12:46:01 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 18 May 2010 18:35:47 +0200

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.

Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Frederic Weisbecker <[email protected]>

LKML-Reference: <[email protected]>

---
 kernel/perf_event.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/perf_event.c +1 -1
index 17ac47f..8d61d29 100644
@@ -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)