diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-06 08:08:59 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-06 08:08:59 -0500 |
| commit | 13216f848a120760fa372b9ae8f6d0840f4a83ba (patch) | |
| tree | 2e629da768bf4f5c5ddccbdb4fa0509b82cec171 | |
| parent | b062e0f0a4046724e349b92a3edf79141320422e (diff) | |
| parent | 2d8d6d1ebfd62ebc6da931170d949d8c02f67b76 (diff) | |
| download | tor-13216f848a120760fa372b9ae8f6d0840f4a83ba.tar.gz tor-13216f848a120760fa372b9ae8f6d0840f4a83ba.zip | |
Merge branch 'maint-0.4.2'
| -rw-r--r-- | changes/bug32841 | 4 | ||||
| -rw-r--r-- | src/lib/sandbox/sandbox.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug32841 b/changes/bug32841 new file mode 100644 index 0000000000..48568f6a61 --- /dev/null +++ b/changes/bug32841 @@ -0,0 +1,4 @@ + o Minor bugfixes (linux seccomp sandbox): + - Fix crash when reloading logging configuration while the + experimental sandbox is enabled. Fixes bug 32841; 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 5c212f89ba..badf730f15 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 |