Commit 25f42985825dd93f0593efe454e54c2aa13f7830

Authored by Stephane Eranian
Committed by Ingo Molnar
1 parent 9ee6ddc9da

perf/x86: Fix broken LBR fixup code

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

arch/x86/lib/usercopy.c
... ... @@ -22,7 +22,7 @@
22 22 void *map;
23 23 int ret;
24 24  
25   - if (__range_not_ok(from, n, TASK_SIZE) == 0)
  25 + if (__range_not_ok(from, n, TASK_SIZE))
26 26 return len;
27 27  
28 28 do {