Commit 052f9d20 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/uaccess: Merge raw_copy_to_user_allowed() into raw_copy_to_user() 



Since commit 17bc4336 ("powerpc/uaccess: Implement
unsafe_copy_to_user() as a simple loop"), raw_copy_to_user_allowed()
is only used by raw_copy_to_user().

Merge raw_copy_to_user_allowed() into raw_copy_to_user().

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/3ae114740317187e12edbd5ffa9157cb8c396dea.1612879284.git.christophe.leroy@csgroup.eu
parent 95d019e0

arch/powerpc/include/asm/uaccess.h

+1 −7
Original line number Diff line number Diff line
@@ -401,19 +401,13 @@ static inline unsigned long raw_copy_from_user(void *to, 
	return ret;

}



static inline unsigned long

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

{

	return __copy_tofrom_user(to, (__force const void __user *)from, n);

}



static inline unsigned long

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

{

	unsigned long ret;



	allow_write_to_user(to, n);

	ret = raw_copy_to_user_allowed(to, from, n);

	ret = __copy_tofrom_user(to, (__force const void __user *)from, n);

	prevent_write_to_user(to, n);

	return ret;

}