Commit 1438c6c7 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.3.1' into maint-0.3.2

parents f0230ee3 5c363992

changes/bug24969

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/common/sandbox.c

+3 −0
Original line number Diff line number Diff line
@@ -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