mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
arm: switch to RAW_COPY_USER
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
0f9b38cd79
commit
4de5b63e76
2 changed files with 17 additions and 48 deletions
|
@ -96,6 +96,7 @@ config ARM
|
||||||
select PERF_USE_VMALLOC
|
select PERF_USE_VMALLOC
|
||||||
select RTC_LIB
|
select RTC_LIB
|
||||||
select SYS_SUPPORTS_APM_EMULATION
|
select SYS_SUPPORTS_APM_EMULATION
|
||||||
|
select ARCH_HAS_RAW_COPY_USER
|
||||||
# Above selects are sorted alphabetically; please add new ones
|
# Above selects are sorted alphabetically; please add new ones
|
||||||
# according to that. Thanks.
|
# according to that. Thanks.
|
||||||
help
|
help
|
||||||
|
|
|
@ -455,7 +455,7 @@ extern unsigned long __must_check
|
||||||
arm_copy_from_user(void *to, const void __user *from, unsigned long n);
|
arm_copy_from_user(void *to, const void __user *from, unsigned long n);
|
||||||
|
|
||||||
static inline unsigned long __must_check
|
static inline unsigned long __must_check
|
||||||
__arch_copy_from_user(void *to, const void __user *from, unsigned long n)
|
raw_copy_from_user(void *to, const void __user *from, unsigned long n)
|
||||||
{
|
{
|
||||||
unsigned int __ua_flags;
|
unsigned int __ua_flags;
|
||||||
|
|
||||||
|
@ -471,7 +471,7 @@ extern unsigned long __must_check
|
||||||
__copy_to_user_std(void __user *to, const void *from, unsigned long n);
|
__copy_to_user_std(void __user *to, const void *from, unsigned long n);
|
||||||
|
|
||||||
static inline unsigned long __must_check
|
static inline unsigned long __must_check
|
||||||
__arch_copy_to_user(void __user *to, const void *from, unsigned long n)
|
raw_copy_to_user(void __user *to, const void *from, unsigned long n)
|
||||||
{
|
{
|
||||||
#ifndef CONFIG_UACCESS_WITH_MEMCPY
|
#ifndef CONFIG_UACCESS_WITH_MEMCPY
|
||||||
unsigned int __ua_flags;
|
unsigned int __ua_flags;
|
||||||
|
@ -499,54 +499,22 @@ __clear_user(void __user *addr, unsigned long n)
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
#define __arch_copy_from_user(to, from, n) \
|
static inline unsigned long
|
||||||
(memcpy(to, (void __force *)from, n), 0)
|
raw_copy_from_user(void *to, const void __user *from, unsigned long n)
|
||||||
#define __arch_copy_to_user(to, from, n) \
|
{
|
||||||
(memcpy((void __force *)to, from, n), 0)
|
memcpy(to, (const void __force *)from, n);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
static inline unsigned long
|
||||||
|
raw_copy_to_user(void __user *to, const void *from, unsigned long n)
|
||||||
|
{
|
||||||
|
memcpy((void __force *)to, from, n);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
#define __clear_user(addr, n) (memset((void __force *)addr, 0, n), 0)
|
#define __clear_user(addr, n) (memset((void __force *)addr, 0, n), 0)
|
||||||
#endif
|
#endif
|
||||||
|
#define INLINE_COPY_TO_USER
|
||||||
static inline unsigned long __must_check
|
#define INLINE_COPY_FROM_USER
|
||||||
__copy_from_user(void *to, const void __user *from, unsigned long n)
|
|
||||||
{
|
|
||||||
check_object_size(to, n, false);
|
|
||||||
return __arch_copy_from_user(to, from, n);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline unsigned long __must_check
|
|
||||||
copy_from_user(void *to, const void __user *from, unsigned long n)
|
|
||||||
{
|
|
||||||
unsigned long res = n;
|
|
||||||
|
|
||||||
check_object_size(to, n, false);
|
|
||||||
|
|
||||||
if (likely(access_ok(VERIFY_READ, from, n)))
|
|
||||||
res = __arch_copy_from_user(to, from, n);
|
|
||||||
if (unlikely(res))
|
|
||||||
memset(to + (n - res), 0, res);
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline unsigned long __must_check
|
|
||||||
__copy_to_user(void __user *to, const void *from, unsigned long n)
|
|
||||||
{
|
|
||||||
check_object_size(from, n, true);
|
|
||||||
|
|
||||||
return __arch_copy_to_user(to, from, n);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline unsigned long __must_check
|
|
||||||
copy_to_user(void __user *to, const void *from, unsigned long n)
|
|
||||||
{
|
|
||||||
check_object_size(from, n, true);
|
|
||||||
|
|
||||||
if (access_ok(VERIFY_WRITE, to, n))
|
|
||||||
n = __arch_copy_to_user(to, from, n);
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define __copy_to_user_inatomic __copy_to_user
|
|
||||||
#define __copy_from_user_inatomic __copy_from_user
|
|
||||||
|
|
||||||
static inline unsigned long __must_check clear_user(void __user *to, unsigned long n)
|
static inline unsigned long __must_check clear_user(void __user *to, unsigned long n)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue