diff options
author | Kees Cook <keescook@chromium.org> | 2016-07-07 14:38:39 -0400 |
---|---|---|
committer | Kees Cook <keescook@chromium.org> | 2016-07-26 17:41:52 -0400 |
commit | 97433ea4fda62349bfa42089455593cbcb57e06c (patch) | |
tree | 308fd5074718b4dfa06d399c4dbf32cdde5956a3 /arch/s390/lib | |
parent | 9d9208a15800f9f06f102f9aac1e8b323c3b8575 (diff) |
s390/uaccess: Enable hardened usercopy
Enables CONFIG_HARDENED_USERCOPY checks on s390.
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'arch/s390/lib')
-rw-r--r-- | arch/s390/lib/uaccess.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/lib/uaccess.c b/arch/s390/lib/uaccess.c index ae4de559e3a0..6986c20166f0 100644 --- a/arch/s390/lib/uaccess.c +++ b/arch/s390/lib/uaccess.c | |||
@@ -104,6 +104,7 @@ static inline unsigned long copy_from_user_mvcp(void *x, const void __user *ptr, | |||
104 | 104 | ||
105 | unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n) | 105 | unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n) |
106 | { | 106 | { |
107 | check_object_size(to, n, false); | ||
107 | if (static_branch_likely(&have_mvcos)) | 108 | if (static_branch_likely(&have_mvcos)) |
108 | return copy_from_user_mvcos(to, from, n); | 109 | return copy_from_user_mvcos(to, from, n); |
109 | return copy_from_user_mvcp(to, from, n); | 110 | return copy_from_user_mvcp(to, from, n); |
@@ -177,6 +178,7 @@ static inline unsigned long copy_to_user_mvcs(void __user *ptr, const void *x, | |||
177 | 178 | ||
178 | unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n) | 179 | unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n) |
179 | { | 180 | { |
181 | check_object_size(from, n, true); | ||
180 | if (static_branch_likely(&have_mvcos)) | 182 | if (static_branch_likely(&have_mvcos)) |
181 | return copy_to_user_mvcos(to, from, n); | 183 | return copy_to_user_mvcos(to, from, n); |
182 | return copy_to_user_mvcs(to, from, n); | 184 | return copy_to_user_mvcs(to, from, n); |