aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAKASHI Takahiro <takahiro.akashi@linaro.org>2014-11-28 05:26:37 +0000
committerKees Cook <keescook@google.com>2016-04-08 12:32:25 -0700
commitf19bf57186bfd128fb6a1b2e96008ae7b85873df (patch)
treeacc499ffd8ee96c4bbfedf796190e06c36ea30d5
parent9d0d29c91c923302a64d18f14a7ea21fe1c28e9d (diff)
downloadqcom-msm-v3.10-f19bf57186bfd128fb6a1b2e96008ae7b85873df.tar.gz
BACKPORT: arm64: add seccomp syscall for compat task
This patch allows compat task to issue seccomp() system call. Reviewed-by: Kees Cook <keescook@chromium.org> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> Signed-off-by: Will Deacon <will.deacon@arm.com> Bug: 28020023 Patchset: seccomp (cherry picked from kernel/msm commit 2d9b78ab37c597062cf1cd828df30a3398190452) Signed-off-by: Kees Cook <keescook@google.com> Change-Id: I1e490b7aab9cd6ef544f48b0a3be7696ca089562
-rw-r--r--arch/arm64/include/asm/unistd.h2
-rw-r--r--arch/arm64/include/asm/unistd32.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h
index 2decd485611..cf6ee3149c5 100644
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@ -41,7 +41,7 @@
#define __ARM_NR_compat_cacheflush (__ARM_NR_COMPAT_BASE+2)
#define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE+5)
-#define __NR_compat_syscalls 382
+#define __NR_compat_syscalls 384
#endif
#define __ARCH_WANT_SYS_CLONE
diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h
index 0baae5a5be2..3910d36f843 100644
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@ -785,4 +785,9 @@ __SYSCALL(__NR_finit_module, sys_finit_module)
__SYSCALL(__NR_sched_setattr, sys_sched_setattr)
#define __NR_sched_getattr 381
__SYSCALL(__NR_sched_getattr, sys_sched_getattr)
+/* Backporting seccomp, stub out missing renameat2 call */
+#define __NR_renameat2 382
+__SYSCALL(__NR_renameat2, sys_ni_syscall)
+#define __NR_seccomp 383
+__SYSCALL(__NR_seccomp, sys_seccomp)