aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-05-20 15:49:01 -0400
committerNick Mathewson <nickm@torproject.org>2014-05-20 15:49:01 -0400
commitfef65fa64341fb70df0e7b34d91d3b08a74e7aad (patch)
treead72f6123937dc28ba86fee90c37859015f21955
parent2609b939d63e639d9fffc8aef9bffcb47ea80d66 (diff)
downloadtor-fef65fa64341fb70df0e7b34d91d3b08a74e7aad.tar
tor-fef65fa64341fb70df0e7b34d91d3b08a74e7aad.tar.gz
sandbox: permit gettid, sched_getaffinity
These are needed under some circumstances if we are running with expensive-hardening and sandbox at the same time. fixes 11477, bugfix on 0.2.5.4-alpha (where we introduced expensive-hardening)
-rw-r--r--changes/bug114774
-rw-r--r--src/common/sandbox.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug11477 b/changes/bug11477
new file mode 100644
index 000000000..21dd34591
--- /dev/null
+++ b/changes/bug11477
@@ -0,0 +1,4 @@
+ o Minor bugfixes (linux syscall sandbox):
+ - Prevent the sandbox from crashing on startup when run with the
+ --enable-expensive-hardening configuration option. Fixes bug
+ 11477; bugfix on 0.2.5.4-alpha.
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 5c7d8c87b..bb2b3ed74 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -115,6 +115,7 @@ static int filter_nopar_gen[] = {
#endif
SCMP_SYS(getrlimit),
SCMP_SYS(gettimeofday),
+ SCMP_SYS(gettid),
SCMP_SYS(getuid),
#ifdef __NR_getuid32
SCMP_SYS(getuid32),
@@ -129,6 +130,7 @@ static int filter_nopar_gen[] = {
SCMP_SYS(munmap),
SCMP_SYS(read),
SCMP_SYS(rt_sigreturn),
+ SCMP_SYS(sched_getaffinity),
SCMP_SYS(set_robust_list),
#ifdef __NR_sigreturn
SCMP_SYS(sigreturn),