perf/x86: Fix broken LBR fixup code
authorStephane Eranian <eranian@google.com>
Mon, 11 Jun 2012 13:44:26 +0000 (15:44 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 13 Jun 2012 13:00:28 +0000 (15:00 +0200)
I noticed that the LBR fixups were not working anymore
on programs where they used to. I tracked this down to
a recent change to copy_from_user_nmi():

 db0dc75d640 ("perf/x86: Check user address explicitly in copy_from_user_nmi()")

This commit added a call to __range_not_ok() to the
copy_from_user_nmi() routine. The problem is that the logic
of the test must be reversed. __range_not_ok() returns 0 if the
range is VALID. We want to return early from copy_from_user_nmi()
if the range is NOT valid.

Signed-off-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Arun Sharma <asharma@fb.com>
Link: http://lkml.kernel.org/r/20120611134426.GA7542@quad
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/lib/usercopy.c

index 677b1ed184c9004f8a51b5432f4e29ecb2c24f81..4f74d94c8d9727f013b3ebed6fe5da6e3975ac93 100644 (file)
@@ -22,7 +22,7 @@ copy_from_user_nmi(void *to, const void __user *from, unsigned long n)
        void *map;
        int ret;
 
-       if (__range_not_ok(from, n, TASK_SIZE) == 0)
+       if (__range_not_ok(from, n, TASK_SIZE))
                return len;
 
        do {