Browse Source

Merge branch 'maint-0.3.0'

Nick Mathewson 7 years ago
parent
commit
35025ee51f
2 changed files with 7 additions and 0 deletions
  1. 6 0
      changes/bug21943
  2. 1 0
      src/common/sandbox.c

+ 6 - 0
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.

+ 1 - 0
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