1 files changed, 26 insertions, 0 deletions

diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
index f5dcb5204dcd..3fe0eac59462 100644
--- a/arch/x86/include/asm/uaccess_32.h
+++ b/arch/x86/include/asm/uaccess_32.h
@@ -48,20 +48,28 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
 
                 switch (n) {
                 case 1:
+                        __uaccess_begin();
                         __put_user_size(*(u8 *)from, (u8 __user *)to,
                                         1, ret, 1);
+                        __uaccess_end();
                         return ret;
                 case 2:
+                        __uaccess_begin();
                         __put_user_size(*(u16 *)from, (u16 __user *)to,
                                         2, ret, 2);
+                        __uaccess_end();
                         return ret;
                 case 4:
+                        __uaccess_begin();
                         __put_user_size(*(u32 *)from, (u32 __user *)to,
                                         4, ret, 4);
+                        __uaccess_end();
                         return ret;
                 case 8:
+                        __uaccess_begin();
                         __put_user_size(*(u64 *)from, (u64 __user *)to,
                                         8, ret, 8);
+                        __uaccess_end();
                         return ret;
                 }
         }
@@ -103,13 +111,19 @@ __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
 
                 switch (n) {
                 case 1:
+                        __uaccess_begin();
                         __get_user_size(*(u8 *)to, from, 1, ret, 1);
+                        __uaccess_end();
                         return ret;
                 case 2:
+                        __uaccess_begin();
                         __get_user_size(*(u16 *)to, from, 2, ret, 2);
+                        __uaccess_end();
                         return ret;
                 case 4:
+                        __uaccess_begin();
                         __get_user_size(*(u32 *)to, from, 4, ret, 4);
+                        __uaccess_end();
                         return ret;
                 }
         }
@@ -148,13 +162,19 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
 
                 switch (n) {
                 case 1:
+                        __uaccess_begin();
                         __get_user_size(*(u8 *)to, from, 1, ret, 1);
+                        __uaccess_end();
                         return ret;
                 case 2:
+                        __uaccess_begin();
                         __get_user_size(*(u16 *)to, from, 2, ret, 2);
+                        __uaccess_end();
                         return ret;
                 case 4:
+                        __uaccess_begin();
                         __get_user_size(*(u32 *)to, from, 4, ret, 4);
+                        __uaccess_end();
                         return ret;
                 }
         }
@@ -170,13 +190,19 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
 
                 switch (n) {
                 case 1:
+                        __uaccess_begin();
                         __get_user_size(*(u8 *)to, from, 1, ret, 1);
+                        __uaccess_end();
                         return ret;
                 case 2:
+                        __uaccess_begin();
                         __get_user_size(*(u16 *)to, from, 2, ret, 2);
+                        __uaccess_end();
                         return ret;
                 case 4:
+                        __uaccess_begin();
                         __get_user_size(*(u32 *)to, from, 4, ret, 4);
+                        __uaccess_end();
                         return ret;
                 }
         }