Merge branch 'maint-0.3.2' into release-0.3.2

2018-04-23 09:23:31 -04:00 · 2018-04-23 09:23:31 -04:00 · ecb51bf9f3
parent 65fd973754 1438c6c713
commit ecb51bf9f3
2 changed files with 6 additions and 0 deletions
--- a/changes/bug24969
+++ b/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.
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@ -196,6 +196,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