tor

commit 5f2b75aafd415894153819e9fcd2497c0bbcde46
parent 5345b43fb845cf76d4f0066057170963b96eec7e
Author: Alexander Færøy <ahf@torproject.org>
Date:   Mon,  9 May 2022 14:37:26 +0000

Merge branch 'maint-0.4.6' into maint-0.4.7

Diffstat:
A
changes/ticket40601
 | 
4
++++
M
src/lib/sandbox/sandbox.c
 | 
3
+++

2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/changes/ticket40601 b/changes/ticket40601
@@ -0,0 +1,4 @@
+  o Minor bugfixes (linux seccomp2 sandbox):
+    - Allow the rseq system call in the sandbox. This solves a crash issue with
+      glibc 2.35 on Linux.  Patch from pmu-ipf. Fixes bug 40601; bugfix on
+      0.3.5.11. 
diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
@@ -238,6 +238,9 @@ static int filter_nopar_gen[] = {
 #endif
     SCMP_SYS(read),
     SCMP_SYS(rt_sigreturn),
+#ifdef __NR_rseq
+    SCMP_SYS(rseq),
+#endif
     SCMP_SYS(sched_getaffinity),
 #ifdef __NR_sched_yield
     SCMP_SYS(sched_yield),