summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2020-07-01 12:55:02 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2020-07-01 12:55:02 +0300
commit1932a84ef523c9408907498c9148915760c90826 (patch)
tree7664f980eccceacfcf74fb0abe279bcdabd32d66
parent322abd4fd9ce7e3d60f10e1ef4d343c42d14a9ba (diff)
parent38208185be063cfe575f97b99b3270210fbd0a8c (diff)
downloadtor-1932a84ef523c9408907498c9148915760c90826.tar.gz
tor-1932a84ef523c9408907498c9148915760c90826.zip
Merge branch 'maint-0.4.2' into maint-0.4.3
-rw-r--r--changes/ticket333463
-rw-r--r--src/lib/sandbox/sandbox.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/ticket33346 b/changes/ticket33346
new file mode 100644
index 0000000000..acbbae5169
--- /dev/null
+++ b/changes/ticket33346
@@ -0,0 +1,3 @@
+ o Minor features (linux seccomp2 sandbox):
+ - Permit the unlinkat() syscall, which some Libc implementations
+ use to implement unlink(). Closes ticket 33346.
diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index b917912f4d..365c574029 100644
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -275,6 +275,9 @@ static int filter_nopar_gen[] = {
SCMP_SYS(recvfrom),
SCMP_SYS(sendto),
SCMP_SYS(unlink),
+#ifdef __NR_unlinkat
+ SCMP_SYS(unlinkat),
+#endif
SCMP_SYS(poll)
};