diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-13 16:48:26 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-13 16:48:26 -0500 |
| commit | c45e2f805f7d9cf1ab5b9e1c4a2e75654b62ff9d (patch) | |
| tree | 4f3713c6dd92efe555a754206cb91f8dc62b3258 | |
| parent | a5f3a67a828fe5d121b456a09710e85362245d42 (diff) | |
| parent | 021187f91503814f13dd73b9ed835c20c57f945d (diff) | |
| download | tor-c45e2f805f7d9cf1ab5b9e1c4a2e75654b62ff9d.tar.gz tor-c45e2f805f7d9cf1ab5b9e1c4a2e75654b62ff9d.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5
| -rw-r--r-- | changes/bug28183 | 4 | ||||
| -rw-r--r-- | src/lib/sandbox/sandbox.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug28183 b/changes/bug28183 new file mode 100644 index 0000000000..8d35dcdc01 --- /dev/null +++ b/changes/bug28183 @@ -0,0 +1,4 @@ + o Minor bugfixes (Linux seccomp2 sandbox): + - Permit the "shutdown()" system call, which is apparently + used by OpenSSL under some circumstances. Fixes bug 28183; + bugfix on 0.2.5.1-alpha. diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index 48e37ba127..6f074bb4e1 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -222,6 +222,7 @@ static int filter_nopar_gen[] = { #ifdef __NR_setrlimit SCMP_SYS(setrlimit), #endif + SCMP_SYS(shutdown), #ifdef __NR_sigaltstack SCMP_SYS(sigaltstack), #endif @@ -1803,4 +1804,5 @@ void sandbox_disable_getaddrinfo_cache(void) { } + #endif /* !defined(USE_LIBSECCOMP) */ |