mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.3.1' into maint-0.3.2

Browse source
This commit is contained in:
Nick Mathewson 2018-04-23 09:23:31 -04:00
commit 1438c6c713
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes/bug24969 Normal file
View file

@ -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
src/common/sandbox.c
View file

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