nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.1' into maint-0.4.2

Browse Source
This commit is contained in:
Nick Mathewson 2020-01-06 08:06:54 -05:00
commit 16e94dc7a7
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug32877 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (linux seccomp sandbox):
- Fix crash when reloading logging configuration while the
experimental sandbox is enabled. Fixes bug 29150; bugfix
on 0.4.1.7. Patch by Peter Gerber.

1
src/lib/sandbox/sandbox.c
View File

@ -143,6 +143,7 @@ static int filter_nopar_gen[] = {
SCMP_SYS(clock_gettime), SCMP_SYS(clock_gettime),
SCMP_SYS(close), SCMP_SYS(close),
SCMP_SYS(clone), SCMP_SYS(clone),
SCMP_SYS(dup),
SCMP_SYS(epoll_create), SCMP_SYS(epoll_create),
SCMP_SYS(epoll_wait), SCMP_SYS(epoll_wait),
#ifdef __NR_epoll_pwait #ifdef __NR_epoll_pwait