Browse Source

Merge branch 'bug24969_029_v2' into maint-0.2.9

Nick Mathewson 6 years ago
parent
commit
9727b4c5d6
2 changed files with 6 additions and 0 deletions
  1. 3 0
      changes/bug24969
  2. 3 0
      src/common/sandbox.c

+ 3 - 0
changes/bug24969

@@ -0,0 +1,3 @@
+  o Minor bugfixes (Linux seccomp2 sandbox):
+    - Allow the nanosleep() system call, which glibc uses to implement
+      sleep() and usleep(). Fixes bug 24969; bugfix on 0.2.5.1-alpha.

+ 3 - 0
src/common/sandbox.c

@@ -185,6 +185,9 @@ static int filter_nopar_gen[] = {
     SCMP_SYS(mmap),
 #endif
     SCMP_SYS(munmap),
+#ifdef __NR_nanosleep
+    SCMP_SYS(nanosleep),
+#endif
 #ifdef __NR_prlimit
     SCMP_SYS(prlimit),
 #endif