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

Commit 9d2c178a authored by Daniel Kurtz's avatar Daniel Kurtz
Browse files

Revert "arm64: add seccomp support" 



This reverts commit 923b5e25.
[djkurtz: trivial conflict fixup in arch/arm64/Kconfig]

To be replaced with arm64 seccomp from mainline v3.19.

Change-Id: Icad82d42b1b3d755c8130657cc3675d460320b86
Signed-off-by: default avatarDaniel Kurtz <djkurtz@google.com>
parent 0422055b

arch/arm64/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ config ARM64 
	select HARDIRQS_SW_RESEND

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_TRACEHOOK

	select HAVE_BPF_JIT
@@ -362,19 +361,6 @@ config FORCE_MAX_ZONEORDER 
	default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE)

	default "11"



config SECCOMP

	bool "Enable seccomp to safely compute untrusted bytecode"

	---help---

	  This kernel feature is useful for number crunching applications

	  that may need to compute untrusted bytecode during their

	  execution. By using pipes or other transports made available to

	  the process as file descriptors supporting the read/write

	  syscalls, it's possible to isolate those applications in

	  their own address space using seccomp. Once seccomp is

	  enabled via prctl(PR_SET_SECCOMP), it cannot be disabled

	  and the task is only allowed to execute a few safe syscalls

	  defined by each seccomp mode.



menuconfig ARMV8_DEPRECATED

	bool "Emulate deprecated/obsolete ARMv8 instructions"

	depends on COMPAT

arch/arm64/include/asm/ptrace.h

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ 
 * with ptrace(PTRACE_SET_SYSCALL)

 */

#define RET_SKIP_SYSCALL	-1

#define RET_SKIP_SYSCALL_TRACE	-2

#define IS_SKIP_SYSCALL(no)	((int)(no & 0xffffffff) == -1)



#ifndef __ASSEMBLY__

arch/arm64/include/asm/seccomp.h

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/*

 * arch/arm64/include/asm/seccomp.h

 *

 * Copyright (C) 2014 Linaro Limited

 * Author: AKASHI Takahiro <takahiro.akashi <at> linaro.org>

 *

 * 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.

 */

#ifndef _ASM_SECCOMP_H

#define _ASM_SECCOMP_H



#include <asm/unistd.h>



#ifdef CONFIG_COMPAT

#define __NR_seccomp_read_32		__NR_compat_read

#define __NR_seccomp_write_32		__NR_compat_write

#define __NR_seccomp_exit_32		__NR_compat_exit

#define __NR_seccomp_sigreturn_32	__NR_compat_rt_sigreturn

#endif /* CONFIG_COMPAT */



#include <asm-generic/seccomp.h>



#endif /* _ASM_SECCOMP_H */

arch/arm64/include/asm/unistd.h

+0 −3
Original line number Diff line number Diff line
@@ -31,9 +31,6 @@ 
 * Compat syscall numbers used by the AArch64 kernel.

 */

#define __NR_compat_restart_syscall	0

#define __NR_compat_exit		1

#define __NR_compat_read		3

#define __NR_compat_write		4

#define __NR_compat_sigreturn		119

#define __NR_compat_rt_sigreturn	173

arch/arm64/kernel/entry.S

+0 −2
Original line number Diff line number Diff line
@@ -672,8 +672,6 @@ __sys_trace: 
	mov	x0, sp

	bl	syscall_trace_enter

	adr	lr, __sys_trace_return		// return address

	cmp	w0, #RET_SKIP_SYSCALL_TRACE	// skip syscall and tracing?

	b.eq	ret_to_user

	cmp	w0, #RET_SKIP_SYSCALL		// skip syscall?

	b.eq	__sys_trace_return_skipped

	uxtw	scno, w0			// syscall number (possibly new)