Merge branch 'master' of https://github.com/DMOJ/judge-server

VNOI-Admin · Aug 24, 2023 · 4165af3 · 4165af3
2 parents 0a49309 + d81a1e5
commit 4165af3
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 1 deletion.
diff --git a/dmoj/cptbox/_cptbox.pyx b/dmoj/cptbox/_cptbox.pyx
@@ -155,6 +155,9 @@ cdef int pt_child(void *context) noexcept nogil:
 
 cdef int pt_syscall_handler(void *context, int syscall) noexcept nogil:
     return (<Process>context)._syscall_handler(syscall)
+    # Note that upon exception, this function is guaranteed to return due to noexcept.
+    # Cython will swallow any exception raised and print to stderr, then make this function return 0,
+    # which means to deny syscall.
 
 cdef void pt_syscall_return_handler(void *context, pid_t pid, int syscall) noexcept with gil:
     (<Debugger>context)._on_return(pid, syscall)

diff --git a/dmoj/cptbox/isolate.py b/dmoj/cptbox/isolate.py
@@ -148,6 +148,8 @@ def __init__(
                 sys_getuid: ALLOW,
                 sys_getegid: ALLOW,
                 sys_getgid: ALLOW,
+                sys_setfsgid: ACCESS_EPERM,
+                sys_setfsuid: ACCESS_EPERM,
                 sys_getdents: ALLOW,
                 sys_lseek: ALLOW,
                 sys_getrusage: ALLOW,

diff --git a/dmoj/cptbox/syscalls.pyi b/dmoj/cptbox/syscalls.pyi
@@ -52,6 +52,7 @@ sys_bindat: int
 sys_bpf: int
 sys_break: int
 sys_brk: int
+sys_cachestat: int
 sys_cap_enter: int
 sys_cap_fcntls_get: int
 sys_cap_fcntls_limit: int
@@ -301,6 +302,7 @@ sys_kmq_timedreceive: int
 sys_kmq_timedsend: int
 sys_kmq_unlink: int
 sys_kqueue: int
+sys_kqueuex: int
 sys_kse_create: int
 sys_kse_exit: int
 sys_kse_release: int

diff --git a/dmoj/cptbox/syscalls/freebsd.tbl b/dmoj/cptbox/syscalls/freebsd.tbl
@@ -134,6 +134,7 @@
 136	mkdir
 137	rmdir
 138	utimes
+139	sigreturn
 140	adjtime
 141	getpeername
 142	gethostid
@@ -512,3 +513,4 @@
 580	fspacectl
 581	sched_getcpu
 582	swapoff
+583	kqueuex
diff --git a/dmoj/cptbox/syscalls/linux-arm.tbl b/dmoj/cptbox/syscalls/linux-arm.tbl
@@ -440,3 +440,4 @@
 448	process_mrelease
 449	futex_waitv
 450	set_mempolicy_home_node
+451	cachestat
diff --git a/dmoj/cptbox/syscalls/linux-generic.tbl b/dmoj/cptbox/syscalls/linux-generic.tbl
@@ -324,3 +324,4 @@
 448	process_mrelease
 449	futex_waitv
 450	set_mempolicy_home_node
+451	cachestat
diff --git a/dmoj/cptbox/syscalls/linux-generic32.tbl b/dmoj/cptbox/syscalls/linux-generic32.tbl
@@ -324,3 +324,4 @@
 448	process_mrelease
 449	futex_waitv
 450	set_mempolicy_home_node
+451	cachestat
diff --git a/dmoj/cptbox/syscalls/linux-x32.tbl b/dmoj/cptbox/syscalls/linux-x32.tbl
@@ -313,6 +313,7 @@
 448	process_mrelease
 449	futex_waitv
 450	set_mempolicy_home_node
+451	cachestat
 512	rt_sigaction
 513	rt_sigreturn
 514	ioctl

diff --git a/dmoj/cptbox/syscalls/linux-x64.tbl b/dmoj/cptbox/syscalls/linux-x64.tbl
@@ -360,3 +360,4 @@
 448	process_mrelease
 449	futex_waitv
 450	set_mempolicy_home_node
+451	cachestat
diff --git a/dmoj/cptbox/syscalls/linux-x86.tbl b/dmoj/cptbox/syscalls/linux-x86.tbl
@@ -438,3 +438,4 @@
 448	process_mrelease
 449	futex_waitv
 450	set_mempolicy_home_node
+451	cachestat
diff --git a/dmoj/executors/GO.py b/dmoj/executors/GO.py
@@ -21,7 +21,7 @@ class Executor(CompiledExecutor):
     address_grace = 786432
     command = 'go'
     syscalls = ['mincore', 'mlock', 'setrlimit']
-    compiler_syscalls = ['setrlimit', 'copy_file_range']
+    compiler_syscalls = ['copy_file_range', 'setrlimit']
     fs = [
         # Go will start without THP information, but has some tuning for when
         # it is available -- so let's allow it to tell.