diff options
| author | Alexander Færøy <ahf@torproject.org> | 2022-05-09 14:37:26 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2022-05-09 14:37:26 +0000 |
| commit | 5568961cbf0749f5a9499abdda4ca98cffdc0992 (patch) | |
| tree | 6fc9deefc2a2b521d39f9f3bacee0a1debc5c66e | |
| parent | 18cc67f1614a3819b55883a421710a59a66c27a5 (diff) | |
| parent | 4ba89c0ccc9452fa995f75a75824e828f62bbf92 (diff) | |
| download | tor-5568961cbf0749f5a9499abdda4ca98cffdc0992.tar.gz tor-5568961cbf0749f5a9499abdda4ca98cffdc0992.zip | |
Merge branch 'maint-0.4.6' into release-0.4.6
| -rw-r--r-- | changes/ticket40601 | 4 | ||||
| -rw-r--r-- | src/lib/sandbox/sandbox.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/ticket40601 b/changes/ticket40601 new file mode 100644 index 0000000000..529e3badfe --- /dev/null +++ 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 index 5f73fd2b46..9a7487a2fa 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -227,6 +227,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), |