Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41e3ca9b authored by Kees Cook's avatar Kees Cook Committed by Alex Shi
Browse files

s390/uaccess: Enable hardened usercopy 



Enables CONFIG_HARDENED_USERCOPY checks on s390.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
(cherry picked from commit 97433ea4fda62349bfa42089455593cbcb57e06c)
Signed-off-by: default avatarAlex Shi <alex.shi@linaro.org>
parent 17427c2d

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ config S390 
	select HAVE_ALIGNED_STRUCT_PAGE if SLUB

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_EARLY_PFN_TO_NID

	select HAVE_ARCH_HARDENED_USERCOPY

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_SOFT_DIRTY

arch/s390/lib/uaccess.c

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static inline unsigned long copy_from_user_mvcp(void *x, const void __user *ptr, 


unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)

{

	check_object_size(to, n, false);

	if (static_branch_likely(&have_mvcos))

		return copy_from_user_mvcos(to, from, n);

	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, 


unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)

{

	check_object_size(from, n, true);

	if (static_branch_likely(&have_mvcos))

		return copy_to_user_mvcos(to, from, n);

	return copy_to_user_mvcs(to, from, n);