|
@@ -241,12 +241,18 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
|
|
|
static inline unsigned long
|
|
|
__copy_to_user (void __user *to, const void *from, unsigned long count)
|
|
|
{
|
|
|
+ if (!__builtin_constant_p(count))
|
|
|
+ check_object_size(from, count, true);
|
|
|
+
|
|
|
return __copy_user(to, (__force void __user *) from, count);
|
|
|
}
|
|
|
|
|
|
static inline unsigned long
|
|
|
__copy_from_user (void *to, const void __user *from, unsigned long count)
|
|
|
{
|
|
|
+ if (!__builtin_constant_p(count))
|
|
|
+ check_object_size(to, count, false);
|
|
|
+
|
|
|
return __copy_user((__force void __user *) to, from, count);
|
|
|
}
|
|
|
|
|
@@ -258,8 +264,11 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
|
|
|
const void *__cu_from = (from); \
|
|
|
long __cu_len = (n); \
|
|
|
\
|
|
|
- if (__access_ok(__cu_to, __cu_len, get_fs())) \
|
|
|
- __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
|
|
|
+ if (__access_ok(__cu_to, __cu_len, get_fs())) { \
|
|
|
+ if (!__builtin_constant_p(n)) \
|
|
|
+ check_object_size(__cu_from, __cu_len, true); \
|
|
|
+ __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
|
|
|
+ } \
|
|
|
__cu_len; \
|
|
|
})
|
|
|
|
|
@@ -270,8 +279,11 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
|
|
|
long __cu_len = (n); \
|
|
|
\
|
|
|
__chk_user_ptr(__cu_from); \
|
|
|
- if (__access_ok(__cu_from, __cu_len, get_fs())) \
|
|
|
+ if (__access_ok(__cu_from, __cu_len, get_fs())) { \
|
|
|
+ if (!__builtin_constant_p(n)) \
|
|
|
+ check_object_size(__cu_to, __cu_len, false); \
|
|
|
__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
|
|
|
+ } \
|
|
|
__cu_len; \
|
|
|
})
|
|
|
|