Commit a7a08b27 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Torvalds
Browse files

arch: remove compat_alloc_user_space 

All users of compat_alloc_user_space() and copy_in_user() have been
removed from the kernel, only a few functions in sparc remain that can be
changed to calling arch_copy_in_user() instead.

Link: https://lkml.kernel.org/r/20210727144859.4150043-7-arnd@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Feng Tang <feng.tang@intel.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 59ab844e

arch/arm64/include/asm/compat.h

+0 −5
Original line number Diff line number Diff line
@@ -107,11 +107,6 @@ struct compat_statfs { 
#define compat_user_stack_pointer() (user_stack_pointer(task_pt_regs(current)))

#define COMPAT_MINSIGSTKSZ	2048



static inline void __user *arch_compat_alloc_user_space(long len)

{

	return (void __user *)compat_user_stack_pointer() - len;

}



struct compat_ipc64_perm {

	compat_key_t key;

	__compat_uid32_t uid;

arch/arm64/include/asm/uaccess.h

+0 −11
Original line number Diff line number Diff line
@@ -430,17 +430,6 @@ extern unsigned long __must_check __arch_copy_to_user(void __user *to, const voi 
	__actu_ret;							\

})



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

#define raw_copy_in_user(to, from, n)					\

({									\

	unsigned long __aciu_ret;					\

	uaccess_ttbr0_enable();						\

	__aciu_ret = __arch_copy_in_user(__uaccess_mask_ptr(to),	\

				    __uaccess_mask_ptr(from), (n));	\

	uaccess_ttbr0_disable();					\

	__aciu_ret;							\

})



#define INLINE_COPY_TO_USER

#define INLINE_COPY_FROM_USER

arch/arm64/lib/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

lib-y		:= clear_user.o delay.o copy_from_user.o		\

		   copy_to_user.o copy_in_user.o copy_page.o		\

		   copy_to_user.o copy_page.o				\

		   clear_page.o csum.o insn.o memchr.o memcpy.o		\

		   memset.o memcmp.o strcmp.o strncmp.o strlen.o	\

		   strnlen.o strchr.o strrchr.o tishift.o

arch/arm64/lib/copy_in_user.S

deleted100644 → 0
+0 −77
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copy from user space to user space

 *

 * Copyright (C) 2012 ARM Ltd.

 */



#include <linux/linkage.h>



#include <asm/asm-uaccess.h>

#include <asm/assembler.h>

#include <asm/cache.h>



/*

 * Copy from user space to user space (alignment handled by the hardware)

 *

 * Parameters:

 *	x0 - to

 *	x1 - from

 *	x2 - n

 * Returns:

 *	x0 - bytes not copied

 */

	.macro ldrb1 reg, ptr, val

	user_ldst 9998f, ldtrb, \reg, \ptr, \val

	.endm



	.macro strb1 reg, ptr, val

	user_ldst 9998f, sttrb, \reg, \ptr, \val

	.endm



	.macro ldrh1 reg, ptr, val

	user_ldst 9997f, ldtrh, \reg, \ptr, \val

	.endm



	.macro strh1 reg, ptr, val

	user_ldst 9997f, sttrh, \reg, \ptr, \val

	.endm



	.macro ldr1 reg, ptr, val

	user_ldst 9997f, ldtr, \reg, \ptr, \val

	.endm



	.macro str1 reg, ptr, val

	user_ldst 9997f, sttr, \reg, \ptr, \val

	.endm



	.macro ldp1 reg1, reg2, ptr, val

	user_ldp 9997f, \reg1, \reg2, \ptr, \val

	.endm



	.macro stp1 reg1, reg2, ptr, val

	user_stp 9997f, \reg1, \reg2, \ptr, \val

	.endm



end	.req	x5

srcin	.req	x15

SYM_FUNC_START(__arch_copy_in_user)

	add	end, x0, x2

	mov	srcin, x1

#include "copy_template.S"

	mov	x0, #0

	ret

SYM_FUNC_END(__arch_copy_in_user)

EXPORT_SYMBOL(__arch_copy_in_user)



	.section .fixup,"ax"

	.align	2

9997:	cmp	dst, dstin

	b.ne	9998f

	// Before being absolutely sure we couldn't copy anything, try harder

USER(9998f, ldtrb tmp1w, [srcin])

USER(9998f, sttrb tmp1w, [dst])

	add	dst, dst, #1

9998:	sub	x0, end, dst			// bytes not copied

	ret

	.previous

arch/mips/cavium-octeon/octeon-memcpy.S

+0 −2
Original line number Diff line number Diff line
@@ -154,8 +154,6 @@ FEXPORT(__raw_copy_from_user) 
EXPORT_SYMBOL(__raw_copy_from_user)

FEXPORT(__raw_copy_to_user)

EXPORT_SYMBOL(__raw_copy_to_user)

FEXPORT(__raw_copy_in_user)

EXPORT_SYMBOL(__raw_copy_in_user)

	/*

	 * Note: dst & src may be unaligned, len may be 0

	 * Temps