std: separate seccomp constants

This avoids inadvertently using PNRs as syscall numbers.

Signed-off-by: Ophestra <cat@gensokyo.uk>

2 files changed, 76 insertions, 76 deletions

diff --git a/container/seccomp/libseccomp.go b/container/seccomp/libseccomp.go
index 962d6844..4684be26 100644
--- a/container/seccomp/libseccomp.go
+++ b/container/seccomp/libseccomp.go
@@ -215,10 +215,10 @@ const (
 
 // syscallResolveName resolves a syscall number by name via seccomp_syscall_resolve_name.
 // This function is only for testing the lookup tables and included here for convenience.
-func syscallResolveName(s string) (trap int, ok bool) {
+func syscallResolveName(s string) (num std.ScmpSyscall, ok bool) {
 	v := C.CString(s)
-	trap = int(C.seccomp_syscall_resolve_name(v))
+	num = std.ScmpSyscall(C.seccomp_syscall_resolve_name(v))
 	C.free(unsafe.Pointer(v))
-	ok = trap != C.__NR_SCMP_ERROR
+	ok = num != C.__NR_SCMP_ERROR
 	return
 }
diff --git a/container/seccomp/presets.go b/container/seccomp/presets.go
index f16bc82c..b03907f2 100644
--- a/container/seccomp/presets.go
+++ b/container/seccomp/presets.go
@@ -68,62 +68,62 @@ func Preset(presets FilterPreset, flags ExportFlag) (rules []NativeRule) {
 var (
 	presetCommon = []NativeRule{
 		/* Block dmesg */
-		{ScmpSyscall(SYS_SYSLOG), ScmpErrno(EPERM), nil},
+		{SNR_SYSLOG, ScmpErrno(EPERM), nil},
 		/* Useless old syscall */
-		{ScmpSyscall(SYS_USELIB), ScmpErrno(EPERM), nil},
+		{SNR_USELIB, ScmpErrno(EPERM), nil},
 		/* Don't allow disabling accounting */
-		{ScmpSyscall(SYS_ACCT), ScmpErrno(EPERM), nil},
+		{SNR_ACCT, ScmpErrno(EPERM), nil},
 		/* Don't allow reading current quota use */
-		{ScmpSyscall(SYS_QUOTACTL), ScmpErrno(EPERM), nil},
+		{SNR_QUOTACTL, ScmpErrno(EPERM), nil},
 
 		/* Don't allow access to the kernel keyring */
-		{ScmpSyscall(SYS_ADD_KEY), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_KEYCTL), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_REQUEST_KEY), ScmpErrno(EPERM), nil},
+		{SNR_ADD_KEY, ScmpErrno(EPERM), nil},
+		{SNR_KEYCTL, ScmpErrno(EPERM), nil},
+		{SNR_REQUEST_KEY, ScmpErrno(EPERM), nil},
 
 		/* Scary VM/NUMA ops */
-		{ScmpSyscall(SYS_MOVE_PAGES), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_MBIND), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_GET_MEMPOLICY), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SET_MEMPOLICY), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_MIGRATE_PAGES), ScmpErrno(EPERM), nil},
+		{SNR_MOVE_PAGES, ScmpErrno(EPERM), nil},
+		{SNR_MBIND, ScmpErrno(EPERM), nil},
+		{SNR_GET_MEMPOLICY, ScmpErrno(EPERM), nil},
+		{SNR_SET_MEMPOLICY, ScmpErrno(EPERM), nil},
+		{SNR_MIGRATE_PAGES, ScmpErrno(EPERM), nil},
 	}
 
 	/* hakurei: project-specific extensions */
 	presetCommonExt = []NativeRule{
 		/* system calls for changing the system clock */
-		{ScmpSyscall(SYS_ADJTIMEX), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_CLOCK_ADJTIME), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_CLOCK_ADJTIME64), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_CLOCK_SETTIME), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_CLOCK_SETTIME64), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SETTIMEOFDAY), ScmpErrno(EPERM), nil},
+		{SNR_ADJTIMEX, ScmpErrno(EPERM), nil},
+		{SNR_CLOCK_ADJTIME, ScmpErrno(EPERM), nil},
+		{SNR_CLOCK_ADJTIME64, ScmpErrno(EPERM), nil},
+		{SNR_CLOCK_SETTIME, ScmpErrno(EPERM), nil},
+		{SNR_CLOCK_SETTIME64, ScmpErrno(EPERM), nil},
+		{SNR_SETTIMEOFDAY, ScmpErrno(EPERM), nil},
 
 		/* loading and unloading of kernel modules */
-		{ScmpSyscall(SYS_DELETE_MODULE), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_FINIT_MODULE), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_INIT_MODULE), ScmpErrno(EPERM), nil},
+		{SNR_DELETE_MODULE, ScmpErrno(EPERM), nil},
+		{SNR_FINIT_MODULE, ScmpErrno(EPERM), nil},
+		{SNR_INIT_MODULE, ScmpErrno(EPERM), nil},
 
 		/* system calls for rebooting and reboot preparation */
-		{ScmpSyscall(SYS_KEXEC_FILE_LOAD), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_KEXEC_LOAD), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_REBOOT), ScmpErrno(EPERM), nil},
+		{SNR_KEXEC_FILE_LOAD, ScmpErrno(EPERM), nil},
+		{SNR_KEXEC_LOAD, ScmpErrno(EPERM), nil},
+		{SNR_REBOOT, ScmpErrno(EPERM), nil},
 
 		/* system calls for enabling/disabling swap devices */
-		{ScmpSyscall(SYS_SWAPOFF), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SWAPON), ScmpErrno(EPERM), nil},
+		{SNR_SWAPOFF, ScmpErrno(EPERM), nil},
+		{SNR_SWAPON, ScmpErrno(EPERM), nil},
 	}
 
 	presetNamespace = []NativeRule{
 		/* Don't allow subnamespace setups: */
-		{ScmpSyscall(SYS_UNSHARE), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SETNS), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_MOUNT), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_UMOUNT), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_UMOUNT2), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_PIVOT_ROOT), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_CHROOT), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_CLONE), ScmpErrno(EPERM),
+		{SNR_UNSHARE, ScmpErrno(EPERM), nil},
+		{SNR_SETNS, ScmpErrno(EPERM), nil},
+		{SNR_MOUNT, ScmpErrno(EPERM), nil},
+		{SNR_UMOUNT, ScmpErrno(EPERM), nil},
+		{SNR_UMOUNT2, ScmpErrno(EPERM), nil},
+		{SNR_PIVOT_ROOT, ScmpErrno(EPERM), nil},
+		{SNR_CHROOT, ScmpErrno(EPERM), nil},
+		{SNR_CLONE, ScmpErrno(EPERM),
 			&ScmpArgCmp{cloneArg, SCMP_CMP_MASKED_EQ, CLONE_NEWUSER, CLONE_NEWUSER}},
 
 		/* seccomp can't look into clone3()'s struct clone_args to check whether
@@ -131,57 +131,57 @@ var (
 		 * Return ENOSYS so user-space will fall back to clone().
 		 * (CVE-2021-41133; see also https://github.com/moby/moby/commit/9f6b562d)
 		 */
-		{ScmpSyscall(SYS_CLONE3), ScmpErrno(ENOSYS), nil},
+		{SNR_CLONE3, ScmpErrno(ENOSYS), nil},
 
 		/* New mount manipulation APIs can also change our VFS. There's no
 		 * legitimate reason to do these in the sandbox, so block all of them
 		 * rather than thinking about which ones might be dangerous.
 		 * (CVE-2021-41133) */
-		{ScmpSyscall(SYS_OPEN_TREE), ScmpErrno(ENOSYS), nil},
-		{ScmpSyscall(SYS_MOVE_MOUNT), ScmpErrno(ENOSYS), nil},
-		{ScmpSyscall(SYS_FSOPEN), ScmpErrno(ENOSYS), nil},
-		{ScmpSyscall(SYS_FSCONFIG), ScmpErrno(ENOSYS), nil},
-		{ScmpSyscall(SYS_FSMOUNT), ScmpErrno(ENOSYS), nil},
-		{ScmpSyscall(SYS_FSPICK), ScmpErrno(ENOSYS), nil},
-		{ScmpSyscall(SYS_MOUNT_SETATTR), ScmpErrno(ENOSYS), nil},
+		{SNR_OPEN_TREE, ScmpErrno(ENOSYS), nil},
+		{SNR_MOVE_MOUNT, ScmpErrno(ENOSYS), nil},
+		{SNR_FSOPEN, ScmpErrno(ENOSYS), nil},
+		{SNR_FSCONFIG, ScmpErrno(ENOSYS), nil},
+		{SNR_FSMOUNT, ScmpErrno(ENOSYS), nil},
+		{SNR_FSPICK, ScmpErrno(ENOSYS), nil},
+		{SNR_MOUNT_SETATTR, ScmpErrno(ENOSYS), nil},
 	}
 
 	/* hakurei: project-specific extensions */
 	presetNamespaceExt = []NativeRule{
 		/* changing file ownership */
-		{ScmpSyscall(SYS_CHOWN), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_CHOWN32), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_FCHOWN), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_FCHOWN32), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_FCHOWNAT), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_LCHOWN), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_LCHOWN32), ScmpErrno(EPERM), nil},
+		{SNR_CHOWN, ScmpErrno(EPERM), nil},
+		{SNR_CHOWN32, ScmpErrno(EPERM), nil},
+		{SNR_FCHOWN, ScmpErrno(EPERM), nil},
+		{SNR_FCHOWN32, ScmpErrno(EPERM), nil},
+		{SNR_FCHOWNAT, ScmpErrno(EPERM), nil},
+		{SNR_LCHOWN, ScmpErrno(EPERM), nil},
+		{SNR_LCHOWN32, ScmpErrno(EPERM), nil},
 
 		/* system calls for changing user ID and group ID credentials */
-		{ScmpSyscall(SYS_SETGID), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SETGID32), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SETGROUPS), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SETGROUPS32), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SETREGID), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SETREGID32), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SETRESGID), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SETRESGID32), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SETRESUID), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SETRESUID32), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SETREUID), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SETREUID32), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SETUID), ScmpErrno(EPERM), nil},
-		{ScmpSyscall(SYS_SETUID32), ScmpErrno(EPERM), nil},
+		{SNR_SETGID, ScmpErrno(EPERM), nil},
+		{SNR_SETGID32, ScmpErrno(EPERM), nil},
+		{SNR_SETGROUPS, ScmpErrno(EPERM), nil},
+		{SNR_SETGROUPS32, ScmpErrno(EPERM), nil},
+		{SNR_SETREGID, ScmpErrno(EPERM), nil},
+		{SNR_SETREGID32, ScmpErrno(EPERM), nil},
+		{SNR_SETRESGID, ScmpErrno(EPERM), nil},
+		{SNR_SETRESGID32, ScmpErrno(EPERM), nil},
+		{SNR_SETRESUID, ScmpErrno(EPERM), nil},
+		{SNR_SETRESUID32, ScmpErrno(EPERM), nil},
+		{SNR_SETREUID, ScmpErrno(EPERM), nil},
+		{SNR_SETREUID32, ScmpErrno(EPERM), nil},
+		{SNR_SETUID, ScmpErrno(EPERM), nil},
+		{SNR_SETUID32, ScmpErrno(EPERM), nil},
 	}
 
 	presetTTY = []NativeRule{
 		/* Don't allow faking input to the controlling tty (CVE-2017-5226) */
-		{ScmpSyscall(SYS_IOCTL), ScmpErrno(EPERM),
+		{SNR_IOCTL, ScmpErrno(EPERM),
 			&ScmpArgCmp{1, SCMP_CMP_MASKED_EQ, 0xFFFFFFFF, TIOCSTI}},
 		/* In the unlikely event that the controlling tty is a Linux virtual
 		 * console (/dev/tty2 or similar), copy/paste operations have an effect
 		 * similar to TIOCSTI (CVE-2023-28100) */
-		{ScmpSyscall(SYS_IOCTL), ScmpErrno(EPERM),
+		{SNR_IOCTL, ScmpErrno(EPERM),
 			&ScmpArgCmp{1, SCMP_CMP_MASKED_EQ, 0xFFFFFFFF, TIOCLINUX}},
 	}
 
@@ -190,15 +190,15 @@ var (
 		 * so it's disabled as a hardening measure.
 		 * However, it is required to run old 16-bit applications
 		 * as well as some Wine patches, so it's allowed in multiarch. */
-		{ScmpSyscall(SYS_MODIFY_LDT), ScmpErrno(EPERM), nil},
+		{SNR_MODIFY_LDT, ScmpErrno(EPERM), nil},
 	}
 
 	/* hakurei: project-specific extensions */
 	presetEmuExt = []NativeRule{
-		{ScmpSyscall(SYS_SUBPAGE_PROT), ScmpErrno(ENOSYS), nil},
-		{ScmpSyscall(SYS_SWITCH_ENDIAN), ScmpErrno(ENOSYS), nil},
-		{ScmpSyscall(SYS_VM86), ScmpErrno(ENOSYS), nil},
-		{ScmpSyscall(SYS_VM86OLD), ScmpErrno(ENOSYS), nil},
+		{SNR_SUBPAGE_PROT, ScmpErrno(ENOSYS), nil},
+		{SNR_SWITCH_ENDIAN, ScmpErrno(ENOSYS), nil},
+		{SNR_VM86, ScmpErrno(ENOSYS), nil},
+		{SNR_VM86OLD, ScmpErrno(ENOSYS), nil},
 	}
 )
 
@@ -206,11 +206,11 @@ func presetDevel(allowedPersonality ScmpDatum) []NativeRule {
 	return []NativeRule{
 		/* Profiling operations; we expect these to be done by tools from outside
 		 * the sandbox.  In particular perf has been the source of many CVEs. */
-		{ScmpSyscall(SYS_PERF_EVENT_OPEN), ScmpErrno(EPERM), nil},
+		{SNR_PERF_EVENT_OPEN, ScmpErrno(EPERM), nil},
 		/* Don't allow you to switch to bsd emulation or whatnot */
-		{ScmpSyscall(SYS_PERSONALITY), ScmpErrno(EPERM),
+		{SNR_PERSONALITY, ScmpErrno(EPERM),
 			&ScmpArgCmp{0, SCMP_CMP_NE, allowedPersonality, 0}},
 
-		{ScmpSyscall(SYS_PTRACE), ScmpErrno(EPERM), nil},
+		{SNR_PTRACE, ScmpErrno(EPERM), nil},
 	}
 }