Merge branch 'maint-0.2.9' into maint-0.3.0

This commit is contained in:
Nick Mathewson 2017-05-08 13:40:26 -04:00
commit d792d2a14d
2 changed files with 7 additions and 0 deletions

6
changes/bug21943 Normal file
View File

@ -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.

View File

@ -155,6 +155,7 @@ static int filter_nopar_gen[] = {
#ifdef __NR_getgid32 #ifdef __NR_getgid32
SCMP_SYS(getgid32), SCMP_SYS(getgid32),
#endif #endif
SCMP_SYS(getpid),
#ifdef __NR_getrlimit #ifdef __NR_getrlimit
SCMP_SYS(getrlimit), SCMP_SYS(getrlimit),
#endif #endif