From e6b02566445b83b04d1f2a1f70da8d620b81f4f8 Mon Sep 17 00:00:00 2001
From: Arun Sharma <asharma@fb.com>
Date: Fri, 20 Apr 2012 15:41:36 -0700
Subject: [PATCH] --- yaml --- r: 310608 b: refs/heads/master c:
 db0dc75d6403b6663c0eab4c6ccb672eb9b2ed72 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/lib/usercopy.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c2516c524bd4..80a0f9963d14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc6ca7b342d5ae15c3ba3081fd40271b8039fb25
+refs/heads/master: db0dc75d6403b6663c0eab4c6ccb672eb9b2ed72
diff --git a/trunk/arch/x86/lib/usercopy.c b/trunk/arch/x86/lib/usercopy.c
index f61ee67ec00f..677b1ed184c9 100644
--- a/trunk/arch/x86/lib/usercopy.c
+++ b/trunk/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)