diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-08 13:40:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-08 13:40:34 -0400 |
| commit | 7372315d5690ec806cdd4eeacd8e41b0f2eeb689 (patch) | |
| tree | 732c4b787ba069551effb87674ac84168c950312 | |
| parent | a6cf5f60141f0bf2577ac552f8a8fde9152a6d7c (diff) | |
| parent | d792d2a14ddb7d2ff62dea8ed7d15416b1254348 (diff) | |
| download | tor-7372315d5690ec806cdd4eeacd8e41b0f2eeb689.tar.gz tor-7372315d5690ec806cdd4eeacd8e41b0f2eeb689.zip | |
Merge branch 'maint-0.3.0' into release-0.3.0
| -rw-r--r-- | changes/bug21943 | 6 | ||||
| -rw-r--r-- | src/common/sandbox.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug21943 b/changes/bug21943 new file mode 100644 index 0000000000..dbe2c726d9 --- /dev/null +++ b/changes/bug21943 @@ -0,0 +1,6 @@ + o Minor bugfixes (Linux seccomp2 sandbox): + - The getpid() system call is now permitted under the Linux seccomp2 + sandbox, to avoid crashing with versions of OpenSSL (and other + libraries) that attempt to learn the process's PID by using the + syscall rather than the VDSO code. Fixes bug 21943; bugfix on + 0.2.5.1-alpha. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 8e72ebf137..9c0b7950bd 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -155,6 +155,7 @@ static int filter_nopar_gen[] = { #ifdef __NR_getgid32 SCMP_SYS(getgid32), #endif + SCMP_SYS(getpid), #ifdef __NR_getrlimit SCMP_SYS(getrlimit), #endif |