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

Commit cd4750dc authored by Vincenzo Frascino's avatar Vincenzo Frascino Committed by Alistair Delva
Browse files

BACKPORT: arm64: compat: Split kuser32 



To make it possible to disable kuser helpers in aarch32 we need to
divide the kuser and the sigreturn functionalities.

Split the current version of kuser32 in kuser32 (for kuser helpers)
and sigreturn32 (for sigreturn helpers).

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
(cherry picked from commit d1e5ca64d5bab864000566ea695617d0e124d27e)
Signed-off-by: default avatarMark Salyzyn <salyzyn@google.com>
Bug: 154668398
Change-Id: I9f3e64a6e6fabfb6c6f0a7e66286ed379b146d99
parent c198164a

arch/arm64/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ $(obj)/%.stub.o: $(obj)/%.o FORCE 
	$(call if_changed,objcopy)



arm64-obj-$(CONFIG_COMPAT)		+= sys32.o kuser32.o signal32.o 	\

					   sys_compat.o

					   sigreturn32.o sys_compat.o

arm64-obj-$(CONFIG_FUNCTION_TRACER)	+= ftrace.o entry-ftrace.o

arm64-obj-$(CONFIG_MODULES)		+= arm64ksyms.o module.o

arm64-obj-$(CONFIG_ARM64_MODULE_PLTS)	+= module-plts.o

arch/arm64/kernel/kuser32.S

+3 −56
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Low-level user helpers placed in the vectors page for AArch32.

 * AArch32 user helpers.

 * Based on the kuser helpers in arch/arm/kernel/entry-armv.S.

 *

 * Copyright (C) 2005-2011 Nicolas Pitre <nico@fluxnic.net>

 * Copyright (C) 2012 ARM Ltd.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 *

 *

 * AArch32 user helpers.

 * Copyright (C) 2012-2018 ARM Ltd.

 *

 * Each segment is 32-byte aligned and will be moved to the top of the high

 * vector page.  New segments (if ever needed) must be added in front of
@@ -77,42 +63,3 @@ __kuser_helper_version: // 0xffff0ffc 
	.word	((__kuser_helper_end - __kuser_helper_start) >> 5)

	.globl	__kuser_helper_end

__kuser_helper_end:
 


/*

 * AArch32 sigreturn code

 *

 * For ARM syscalls, the syscall number has to be loaded into r7.

 * We do not support an OABI userspace.

 *

 * For Thumb syscalls, we also pass the syscall number via r7. We therefore

 * need two 16-bit instructions.

 */

	.globl __aarch32_sigret_code_start

__aarch32_sigret_code_start:



	/*

	 * ARM Code

	 */

	.byte	__NR_compat_sigreturn, 0x70, 0xa0, 0xe3	// mov	r7, #__NR_compat_sigreturn

	.byte	__NR_compat_sigreturn, 0x00, 0x00, 0xef	// svc	#__NR_compat_sigreturn



	/*

	 * Thumb code

	 */

	.byte	__NR_compat_sigreturn, 0x27			// svc	#__NR_compat_sigreturn

	.byte	__NR_compat_sigreturn, 0xdf			// mov	r7, #__NR_compat_sigreturn



	/*

	 * ARM code

	 */

	.byte	__NR_compat_rt_sigreturn, 0x70, 0xa0, 0xe3	// mov	r7, #__NR_compat_rt_sigreturn

	.byte	__NR_compat_rt_sigreturn, 0x00, 0x00, 0xef	// svc	#__NR_compat_rt_sigreturn



	/*

	 * Thumb code

	 */

	.byte	__NR_compat_rt_sigreturn, 0x27			// svc	#__NR_compat_rt_sigreturn

	.byte	__NR_compat_rt_sigreturn, 0xdf			// mov	r7, #__NR_compat_rt_sigreturn



        .globl __aarch32_sigret_code_end

__aarch32_sigret_code_end:

arch/arm64/kernel/sigreturn32.S

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * AArch32 sigreturn code.

 * Based on the kuser helpers in arch/arm/kernel/entry-armv.S.

 *

 * Copyright (C) 2005-2011 Nicolas Pitre <nico@fluxnic.net>

 * Copyright (C) 2012-2018 ARM Ltd.

 *

 * For ARM syscalls, the syscall number has to be loaded into r7.

 * We do not support an OABI userspace.

 *

 * For Thumb syscalls, we also pass the syscall number via r7. We therefore

 * need two 16-bit instructions.

 */



#include <asm/unistd.h>



	.globl __aarch32_sigret_code_start

__aarch32_sigret_code_start:



	/*

	 * ARM Code

	 */

	.byte	__NR_compat_sigreturn, 0x70, 0xa0, 0xe3		// mov	r7, #__NR_compat_sigreturn

	.byte	__NR_compat_sigreturn, 0x00, 0x00, 0xef		// svc	#__NR_compat_sigreturn



	/*

	 * Thumb code

	 */

	.byte	__NR_compat_sigreturn, 0x27			// svc	#__NR_compat_sigreturn

	.byte	__NR_compat_sigreturn, 0xdf			// mov	r7, #__NR_compat_sigreturn



	/*

	 * ARM code

	 */

	.byte	__NR_compat_rt_sigreturn, 0x70, 0xa0, 0xe3	// mov	r7, #__NR_compat_rt_sigreturn

	.byte	__NR_compat_rt_sigreturn, 0x00, 0x00, 0xef	// svc	#__NR_compat_rt_sigreturn



	/*

	 * Thumb code

	 */

	.byte	__NR_compat_rt_sigreturn, 0x27			// svc	#__NR_compat_rt_sigreturn

	.byte	__NR_compat_rt_sigreturn, 0xdf			// mov	r7, #__NR_compat_rt_sigreturn



        .globl __aarch32_sigret_code_end

__aarch32_sigret_code_end: