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 | 1438c6c7134c53b2aa3b5e9abf94fe12a4d9bd5e (patch) | |
| tree | 90cab6aa424f600ffe9638d56f913acd620f3805 | |
| parent | f0230ee38a5031d447758259245a5121ec7e4789 (diff) | |
| parent | 5c3639923fb3d7a1bfc7b38248001e67333fa35e (diff) | |
| download | tor-1438c6c7134c53b2aa3b5e9abf94fe12a4d9bd5e.tar.gz tor-1438c6c7134c53b2aa3b5e9abf94fe12a4d9bd5e.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
| -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 4bfc2cb363..97acf894f3 100644 --- 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 |