diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-06 17:00:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-06 17:22:57 +0200 |
| commit | ff1f74fdcf1881b6c008463c34e9e2a93abe117a (patch) | |
| tree | 234f3bd33f6e6a74943be59211400a53da8d14bf /arch/x86/lib/usercopy.c | |
| parent | 212d95dfdb66e5c81879b08e4f7fbfc8498b1ab5 (diff) | |
| parent | db0dc75d6403b6663c0eab4c6ccb672eb9b2ed72 (diff) | |
Merge branch 'perf/urgent' into perf/core
Eliminate a conflict in a patch I am going to apply.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/lib/usercopy.c')
| -rw-r--r-- | arch/x86/lib/usercopy.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/lib/usercopy.c b/arch/x86/lib/usercopy.c index f61ee67ec00..677b1ed184c 100644 --- a/arch/x86/lib/usercopy.c +++ b/arch/x86/lib/usercopy.c @@ -8,6 +8,7 @@ #include <linux/module.h> #include <asm/word-at-a-time.h> +#include <linux/sched.h> /* * best effort, GUP based copy_from_user() that is NMI-safe @@ -21,6 +22,9 @@ 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) + return len; + do { ret = __get_user_pages_fast(addr, 1, 0, &page); if (!ret) |