mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
152 lines
5.1 KiB
Diff
152 lines
5.1 KiB
Diff
From 0dd13dc36db6d265fe75d054748e94c8bac5821e Mon Sep 17 00:00:00 2001
|
|
From: AKASHI Takahiro <takahiro.akashi@linaro.org>
|
|
Date: Thu, 21 Aug 2014 17:56:45 +0900
|
|
Subject: [PATCH 12/12] arm64: add seccomp support
|
|
|
|
secure_computing() is called first in syscall_trace_enter() so that a system
|
|
call will be aborted quickly without doing succeeding syscall tracing,
|
|
contrary to other cases, if seccomp rules deny that system call.
|
|
|
|
On compat task, syscall numbers for system calls allowed in seccomp mode 1
|
|
are different from those on normal tasks, and so _NR_seccomp_xxx_32's need
|
|
to be redefined.
|
|
|
|
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
|
|
---
|
|
arch/arm64/Kconfig | 14 ++++++++++++++
|
|
arch/arm64/include/asm/ptrace.h | 1 +
|
|
arch/arm64/include/asm/seccomp.h | 25 +++++++++++++++++++++++++
|
|
arch/arm64/include/asm/unistd.h | 3 +++
|
|
arch/arm64/kernel/entry.S | 2 ++
|
|
arch/arm64/kernel/ptrace.c | 5 +++++
|
|
6 files changed, 50 insertions(+)
|
|
create mode 100644 arch/arm64/include/asm/seccomp.h
|
|
|
|
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
|
|
index a3f9d227d179..2d90708b2c8c 100644
|
|
--- a/arch/arm64/Kconfig
|
|
+++ b/arch/arm64/Kconfig
|
|
@@ -34,6 +34,7 @@ config ARM64
|
|
select HAVE_ARCH_AUDITSYSCALL
|
|
select HAVE_ARCH_JUMP_LABEL
|
|
select HAVE_ARCH_KGDB
|
|
+ select HAVE_ARCH_SECCOMP_FILTER
|
|
select HAVE_ARCH_TRACEHOOK
|
|
select HAVE_C_RECORDMCOUNT
|
|
select HAVE_DEBUG_BUGVERBOSE
|
|
@@ -325,6 +326,19 @@ config ARCH_HAS_CACHE_LINE_SIZE
|
|
|
|
source "mm/Kconfig"
|
|
|
|
+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.
|
|
+
|
|
config XEN_DOM0
|
|
def_bool y
|
|
depends on XEN
|
|
diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h
|
|
index 8e4445719e92..e9746486f860 100644
|
|
--- a/arch/arm64/include/asm/ptrace.h
|
|
+++ b/arch/arm64/include/asm/ptrace.h
|
|
@@ -73,6 +73,7 @@
|
|
* 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__
|
|
diff --git a/arch/arm64/include/asm/seccomp.h b/arch/arm64/include/asm/seccomp.h
|
|
new file mode 100644
|
|
index 000000000000..c76fac979629
|
|
--- /dev/null
|
|
+++ b/arch/arm64/include/asm/seccomp.h
|
|
@@ -0,0 +1,25 @@
|
|
+/*
|
|
+ * arch/arm64/include/asm/seccomp.h
|
|
+ *
|
|
+ * Copyright (C) 2014 Linaro Limited
|
|
+ * Author: AKASHI Takahiro <takahiro.akashi@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 */
|
|
diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h
|
|
index 6d2bf419431d..49c9aefd24a5 100644
|
|
--- a/arch/arm64/include/asm/unistd.h
|
|
+++ b/arch/arm64/include/asm/unistd.h
|
|
@@ -31,6 +31,9 @@
|
|
* 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
|
|
|
|
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
|
|
index 88fc4f84c39a..3554d6feb7da 100644
|
|
--- a/arch/arm64/kernel/entry.S
|
|
+++ b/arch/arm64/kernel/entry.S
|
|
@@ -628,6 +628,8 @@ ENDPROC(el0_svc)
|
|
__sys_trace:
|
|
mov x0, sp
|
|
bl syscall_trace_enter
|
|
+ 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
|
|
adr lr, __sys_trace_return // return address
|
|
diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c
|
|
index b29b82576f82..984efa14d2b0 100644
|
|
--- a/arch/arm64/kernel/ptrace.c
|
|
+++ b/arch/arm64/kernel/ptrace.c
|
|
@@ -26,6 +26,7 @@
|
|
#include <linux/smp.h>
|
|
#include <linux/ptrace.h>
|
|
#include <linux/user.h>
|
|
+#include <linux/seccomp.h>
|
|
#include <linux/security.h>
|
|
#include <linux/init.h>
|
|
#include <linux/signal.h>
|
|
@@ -1139,6 +1140,10 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
|
|
{
|
|
unsigned int saved_syscallno = regs->syscallno;
|
|
|
|
+ /* Do the secure computing check first; failures should be fast. */
|
|
+ if (secure_computing(regs->syscallno) == -1)
|
|
+ return RET_SKIP_SYSCALL_TRACE;
|
|
+
|
|
if (test_thread_flag(TIF_SYSCALL_TRACE))
|
|
tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER);
|
|
|
|
--
|
|
2.19.0
|
|
|