Commit 92430dab authored by Al Viro's avatar Al Viro
Browse files

arm64: switch to RAW_COPY_USER 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 46583939

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ config ARM64 
	select SPARSE_IRQ

	select SYSCTL_EXCEPTION_TRACE

	select THREAD_INFO_IN_TASK

	select ARCH_HAS_RAW_COPY_USER

	help

	  ARM 64-bit (AArch64) Linux support.

arch/arm64/include/asm/uaccess.h

+5 −50
Original line number Diff line number Diff line
@@ -331,58 +331,13 @@ do { \ 
})



extern unsigned long __must_check __arch_copy_from_user(void *to, const void __user *from, unsigned long n);

#define raw_copy_from_user __arch_copy_from_user

extern unsigned long __must_check __arch_copy_to_user(void __user *to, const void *from, unsigned long n);

extern unsigned long __must_check __copy_in_user(void __user *to, const void __user *from, unsigned long n);

#define raw_copy_to_user __arch_copy_to_user

extern unsigned long __must_check raw_copy_in_user(void __user *to, const void __user *from, unsigned long n);

extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);



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

{

	kasan_check_write(to, n);

	check_object_size(to, n, false);

	return __arch_copy_from_user(to, from, n);

}



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

{

	kasan_check_read(from, n);

	check_object_size(from, n, true);

	return __arch_copy_to_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;

	kasan_check_write(to, n);

	check_object_size(to, n, false);



	if (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)

{

	kasan_check_read(from, n);

	check_object_size(from, n, true);



	if (access_ok(VERIFY_WRITE, to, n)) {

		n = __arch_copy_to_user(to, from, n);

	}

	return n;

}



static inline unsigned long __must_check copy_in_user(void __user *to, const void __user *from, unsigned long n)

{

	if (access_ok(VERIFY_READ, from, n) && access_ok(VERIFY_WRITE, to, n))

		n = __copy_in_user(to, from, n);

	return n;

}



#define __copy_to_user_inatomic __copy_to_user

#define __copy_from_user_inatomic __copy_from_user

#define INLINE_COPY_TO_USER

#define INLINE_COPY_FROM_USER



static inline unsigned long __must_check clear_user(void __user *to, unsigned long n)

{

arch/arm64/kernel/arm64ksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ EXPORT_SYMBOL(clear_page); 
EXPORT_SYMBOL(__arch_copy_from_user);

EXPORT_SYMBOL(__arch_copy_to_user);

EXPORT_SYMBOL(__clear_user);

EXPORT_SYMBOL(__copy_in_user);

EXPORT_SYMBOL(raw_copy_in_user);



	/* physical memory */

EXPORT_SYMBOL(memstart_addr);

arch/arm64/lib/copy_in_user.S

+2 −2
Original line number Diff line number Diff line
@@ -64,14 +64,14 @@ 
	.endm



end	.req	x5

ENTRY(__copy_in_user)

ENTRY(raw_copy_in_user)

	uaccess_enable_not_uao x3, x4

	add	end, x0, x2

#include "copy_template.S"

	uaccess_disable_not_uao x3

	mov	x0, #0

	ret

ENDPROC(__copy_in_user)

ENDPROC(raw_copy_in_user)



	.section .fixup,"ax"

	.align	2