summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Murray <alex.murray@canonical.com>2020-05-11 14:00:39 +0930
committerPaul Moore <paul@paul-moore.com>2020-05-18 20:32:58 -0400
commit7780b0853eff8521bbf79611656c68fadc1dab3d (patch)
tree2867812debf6de1c8d9cdd85308e07845a228744
parentff2a538cfcfbd1d10c4b460d74d725ac866136f4 (diff)
downloadlibseccomp-7780b0853eff8521bbf79611656c68fadc1dab3d.tar.gz
aarch64: Use architecture specific header to general syscalls
This ensures clone3, getrlimit and setrlimit are defined for aarch64 - also update syscalls.csv from 5.6.0 to pick up these new syscalls Signed-off-by: Alex Murray <alex.murray@canonical.com> Reviewed-by: Tom Hromatka <tom.hromatka@oracle.com> Signed-off-by: Paul Moore <paul@paul-moore.com>
-rwxr-xr-xsrc/arch-syscall-validate2
-rw-r--r--src/syscalls.csv8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/arch-syscall-validate b/src/arch-syscall-validate
index 7fea8d9..809926b 100755
--- a/src/arch-syscall-validate
+++ b/src/arch-syscall-validate
@@ -288,7 +288,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 '/__NR_syscalls/d' | \
sed '/__NR_arch_specific_syscall/d' | \
diff --git a/src/syscalls.csv b/src/syscalls.csv
index be0ab7f..5771158 100644
--- a/src/syscalls.csv
+++ b/src/syscalls.csv
@@ -1,6 +1,6 @@
# libseccomp syscall table
#
-# kernel: 5.6.0-rc6 (Sun, 22 Mar 2020 13:58:38 +0000)
+# kernel: 5.6.0 (Mon, 11 May 2020 04:28:57 +0000)
#
#syscall,x86,x86_64,x32,arm,aarch64,mips,mips64,mips64n32,parisc,parisc64,ppc,ppc64,riscv64,s390,s390x
accept,PNR,43,43,285,202,168,42,42,35,35,330,330,202,PNR,PNR
@@ -40,7 +40,7 @@ clock_nanosleep_time64,407,PNR,PNR,407,PNR,407,PNR,407,407,PNR,407,PNR,PNR,407,P
clock_settime,264,227,227,262,112,262,221,225,255,255,245,245,112,259,259
clock_settime64,404,PNR,PNR,404,PNR,404,PNR,404,404,PNR,404,PNR,PNR,404,PNR
clone,120,56,56,120,220,120,55,55,120,120,120,120,220,120,120
-clone3,435,435,435,435,PNR,435,435,435,435,435,435,435,435,435,435
+clone3,435,435,435,435,435,435,435,435,435,435,435,435,435,435,435
close,6,3,3,6,57,6,3,3,6,6,6,6,57,6,6
connect,362,42,42,283,203,170,41,41,31,31,328,328,203,362,362
copy_file_range,377,326,326,391,285,360,320,324,346,346,379,379,285,375,375
@@ -128,7 +128,7 @@ getresgid,171,120,120,171,150,191,118,118,171,171,170,170,150,171,211
getresgid32,211,PNR,PNR,211,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,211,PNR
getresuid,165,118,118,165,148,186,116,116,165,165,165,165,148,165,209
getresuid32,209,PNR,PNR,209,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,209,PNR
-getrlimit,76,97,97,PNR,PNR,76,95,95,76,76,76,76,163,76,191
+getrlimit,76,97,97,PNR,163,76,95,95,76,76,76,76,163,76,191
get_robust_list,312,274,531,339,100,310,269,273,290,290,299,299,100,305,305
getrusage,77,98,98,77,165,77,96,96,77,77,77,77,165,77,77
getsid,147,124,124,147,156,151,122,122,147,147,147,147,156,147,147
@@ -363,7 +363,7 @@ setresuid,164,117,117,164,147,185,115,115,164,164,164,164,147,164,208
setresuid32,208,PNR,PNR,208,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,208,PNR
setreuid,70,113,113,70,145,70,111,111,70,70,70,70,145,70,203
setreuid32,203,PNR,PNR,203,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,PNR,203,PNR
-setrlimit,75,160,160,75,PNR,75,155,155,75,75,75,75,164,75,75
+setrlimit,75,160,160,75,164,75,155,155,75,75,75,75,164,75,75
set_robust_list,311,273,530,338,99,309,268,272,289,289,300,300,99,304,304
setsid,66,112,112,66,157,66,110,110,66,66,66,66,157,66,66
setsockopt,366,54,541,294,208,181,53,53,181,181,339,339,208,366,366