aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2022-03-28 09:45:16 -0400
committerDavid Goulet <dgoulet@torproject.org>2022-03-28 09:45:16 -0400
commit1949407f0a3108b824484c7788b629be342167fc (patch)
treeb455aeafbf679157b88bf064b5a6eb763564d119
parentd604f602c2ba98cfb2ef81d1425cddb2598f7294 (diff)
parentb882b8d5d4b6c76e41fdf316b58fc26330ec7198 (diff)
downloadtor-1949407f0a3108b824484c7788b629be342167fc.tar.gz
tor-1949407f0a3108b824484c7788b629be342167fc.zip
Merge branch 'maint-0.4.5' into release-0.4.5
-rw-r--r--changes/clone3-sandbox3
-rw-r--r--src/lib/sandbox/sandbox.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/clone3-sandbox b/changes/clone3-sandbox
new file mode 100644
index 0000000000..dac8fe72da
--- /dev/null
+++ b/changes/clone3-sandbox
@@ -0,0 +1,3 @@
+ o Minor features (linux seccomp2 sandbox):
+ - Permit the clone3 syscall, which is apparently used in glibc-2.34 and
+ later. Closes ticket 40590.
diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index fc90dbe062..e6e556eb59 100644
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -152,6 +152,9 @@ static int filter_nopar_gen[] = {
SCMP_SYS(close),
SCMP_SYS(clone),
SCMP_SYS(dup),
+#ifdef __NR_clone3
+ SCMP_SYS(clone3),
+#endif
SCMP_SYS(epoll_create),
SCMP_SYS(epoll_wait),
#ifdef __NR_epoll_pwait