diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-23 09:23:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-23 09:23:31 -0400 |
| commit | 5c3639923fb3d7a1bfc7b38248001e67333fa35e (patch) | |
| tree | 9060b7ea68e584aea2411cb99f4a11d6f4631134 | |
| parent | ce8e7427b9284ef12b69d50d72c8fc315b90e36d (diff) | |
| parent | 9727b4c5d683173888b5a49e8b24c3faa9045521 (diff) | |
| download | tor-5c3639923fb3d7a1bfc7b38248001e67333fa35e.tar.gz tor-5c3639923fb3d7a1bfc7b38248001e67333fa35e.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.1
| -rw-r--r-- | changes/bug24969 | 3 | ||||
| -rw-r--r-- | src/common/sandbox.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug24969 b/changes/bug24969 new file mode 100644 index 0000000000..46b2bae6f4 --- /dev/null +++ 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. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 4dd3e916db..312cf37722 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -191,6 +191,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 |