Commit 4270690b authored by Michal Simek's avatar Michal Simek

microblaze: uaccess: fix copy_from_user macro

copy_from_user macro also use copy_tofrom_user function
Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent cc5a428b
...@@ -375,10 +375,22 @@ extern long __user_bad(void); ...@@ -375,10 +375,22 @@ extern long __user_bad(void);
extern unsigned long __copy_tofrom_user(void __user *to, extern unsigned long __copy_tofrom_user(void __user *to,
const void __user *from, unsigned long size); const void __user *from, unsigned long size);
#define __copy_from_user(to, from, n) copy_from_user((to), (from), (n)) #define __copy_from_user(to, from, n) \
__copy_tofrom_user((__force void __user *)(to), \
(void __user *)(from), (n))
#define __copy_from_user_inatomic(to, from, n) \ #define __copy_from_user_inatomic(to, from, n) \
copy_from_user((to), (from), (n)) copy_from_user((to), (from), (n))
static inline long copy_from_user(void *to,
const void __user *from, unsigned long n)
{
might_sleep();
if (access_ok(VERIFY_READ, from, n))
return __copy_from_user(to, from, n);
else
return n;
}
#define __copy_to_user(to, from, n) \ #define __copy_to_user(to, from, n) \
__copy_tofrom_user((void __user *)(to), \ __copy_tofrom_user((void __user *)(to), \
(__force const void __user *)(from), (n)) (__force const void __user *)(from), (n))
...@@ -394,12 +406,6 @@ static inline long copy_to_user(void __user *to, ...@@ -394,12 +406,6 @@ static inline long copy_to_user(void __user *to,
return n; return n;
} }
#define copy_from_user(to, from, n) \
(access_ok(VERIFY_READ, (from), (n)) ? \
__copy_tofrom_user((__force void __user *)(to), \
(void __user *)(from), (n)) \
: -EFAULT)
extern int __strncpy_user(char *to, const char __user *from, int len); extern int __strncpy_user(char *to, const char __user *from, int len);
extern int __strnlen_user(const char __user *sstr, int len); extern int __strnlen_user(const char __user *sstr, int len);
...@@ -411,7 +417,6 @@ extern int __strnlen_user(const char __user *sstr, int len); ...@@ -411,7 +417,6 @@ extern int __strnlen_user(const char __user *sstr, int len);
#endif /* CONFIG_MMU */ #endif /* CONFIG_MMU */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment