summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hromatka <tom.hromatka@oracle.com>2020-06-01 11:21:41 -0600
committerTom Hromatka <tom.hromatka@oracle.com>2020-06-01 11:21:41 -0600
commit70d4916082a1d3a1ddef4e858be30cff6bbbb123 (patch)
treed06652fed2c2f4e3472c8a54ce23e5b8aa1d9509
parent1dde9d94e0848e12da20602ca38032b91d521427 (diff)
downloadlibseccomp-70d4916082a1d3a1ddef4e858be30cff6bbbb123.tar.gz
aarch64: Use architecture specific header to general syscalls
This ensures clone3, getrlimit and setrlimit are defined for aarch64. Based upon commit 7780b0853eff ("aarch64: Use architecture specific header to general syscalls") in the master branch of libseccomp. Cc: Alex Murray <alex.murray@canonical.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Acked-by: Paul Moore <paul@paul-moore.com>
-rw-r--r--src/arch-aarch64-syscalls.c6
-rwxr-xr-xsrc/arch-syscall-validate2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/arch-aarch64-syscalls.c b/src/arch-aarch64-syscalls.c
index 02f25eb..7454eab 100644
--- a/src/arch-aarch64-syscalls.c
+++ b/src/arch-aarch64-syscalls.c
@@ -68,7 +68,7 @@ const struct arch_syscall_def aarch64_syscall_table[] = { \
{ "clock_settime", 112 },
{ "clock_settime64", __PNR_clock_settime64 },
{ "clone", 220 },
- { "clone3", __PNR_clone3 },
+ { "clone3", 435 },
{ "close", 57 },
{ "connect", 203 },
{ "copy_file_range", 285 },
@@ -159,7 +159,7 @@ const struct arch_syscall_def aarch64_syscall_table[] = { \
{ "getresgid32", __PNR_getresgid32 },
{ "getresuid", 148 },
{ "getresuid32", __PNR_getresuid32 },
- { "getrlimit", __PNR_getrlimit },
+ { "getrlimit", 163 },
{ "getrusage", 165 },
{ "getsid", 156 },
{ "getsockname", 204 },
@@ -391,7 +391,7 @@ const struct arch_syscall_def aarch64_syscall_table[] = { \
{ "setresuid32", __PNR_setresuid32 },
{ "setreuid", 145 },
{ "setreuid32", __PNR_setreuid32 },
- { "setrlimit", __PNR_setrlimit },
+ { "setrlimit", 164 },
{ "setsid", 157 },
{ "setsockopt", 208 },
{ "settimeofday", 170 },
diff --git a/src/arch-syscall-validate b/src/arch-syscall-validate
index b9e0bce..84e7bda 100755
--- a/src/arch-syscall-validate
+++ b/src/arch-syscall-validate
@@ -197,7 +197,7 @@ function dump_sys_aarch64() {
gcc -E -dM -I$1/include/uapi \
-D__BITS_PER_LONG=64 -D__ARCH_WANT_RENAMEAT \
-D__ARCH_WANT_NEW_STAT \
- $1/include/uapi/asm-generic/unistd.h | \
+ $1/arch/arm64/include/uapi/asm/unistd.h | \
grep "^#define __NR_" | \
sed -e '/__NR_syscalls/d' | \
sed -e '/__NR_arch_specific_syscall/d' | \