]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
perf_counter: Fix perf_output_copy() WARN to account for overflow
authorPeter Zijlstra <a.p.zijlstra@chello.nl>
Wed, 13 May 2009 19:26:19 +0000 (21:26 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 15 May 2009 07:46:59 +0000 (09:46 +0200)
The simple reservation test in perf_output_copy() failed to take
unsigned int overflow into account, fix this.

[ Impact: fix false positive warning with more than 4GB of profiling data ]

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/perf_counter.c

index ff166c11b69ae6a8f4937debe0f641c2d268ab49..985be0b662af93a371e9c41438d5e64b50536144 100644 (file)
@@ -1927,7 +1927,11 @@ static void perf_output_copy(struct perf_output_handle *handle,
 
        handle->offset = offset;
 
-       WARN_ON_ONCE(handle->offset > handle->head);
+       /*
+        * Check we didn't copy past our reservation window, taking the
+        * possible unsigned int wrap into account.
+        */
+       WARN_ON_ONCE(((int)(handle->head - handle->offset)) < 0);
 }
 
 #define perf_output_put(handle, x) \