Skip to contentSkip to conversation

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

PATCH New Stephane Eranian 1 participant 1 message May 17, 2010

lore
Share & tools
lore
#0 lore raw

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

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() is perf_output_unlock().

This patch fixes the problem by skipping perf_output_unlock() in case data->nr_pages is 0 while maintaining the accounting for data->lost.

--

kernel/perf_event.c +4 -2
index a4fa381..95137b6 100644
@@ -3035,8 +3035,10 @@ int perf_output_begin(struct perf_output_handle *handle,
 	handle->nmi	= nmi;
 	handle->sample	= sample;
 
-	if (!data->nr_pages)
-		goto fail;
+	if (!data->nr_pages) {
+		atomic_inc(&data->lost);
+		goto out;
+	}
 
 	have_lost = atomic_read(&data->lost);
 	if (have_lost)