diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-06 08:06:54 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-06 08:06:54 -0500 |
| commit | 7b7aa4f070565fda111991f0d49342c977e42f02 (patch) | |
| tree | 5ef8e263587555dd8215dc165904d9eaa8d0861e | |
| parent | 664a2c0755156bce2947338bf08edc1f02326e1d (diff) | |
| parent | 16e94dc7a70e90fe7a1617ffeef817f3394fe382 (diff) | |
| download | tor-7b7aa4f070565fda111991f0d49342c977e42f02.tar.gz tor-7b7aa4f070565fda111991f0d49342c977e42f02.zip | |
Merge branch 'maint-0.4.2' into release-0.4.2
| -rw-r--r-- | changes/bug32877 | 4 | ||||
| -rw-r--r-- | src/lib/sandbox/sandbox.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug32877 b/changes/bug32877 new file mode 100644 index 0000000000..96fe1af708 --- /dev/null +++ b/changes/bug32877 @@ -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. diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index 0b316e9c6a..6fed7eb0e2 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -143,6 +143,7 @@ static int filter_nopar_gen[] = { SCMP_SYS(clock_gettime), SCMP_SYS(close), SCMP_SYS(clone), + SCMP_SYS(dup), SCMP_SYS(epoll_create), SCMP_SYS(epoll_wait), #ifdef __NR_epoll_pwait |