[tor-commits] [tor/master] sandbox: permit gettid, sched_getaffinity

[nickm at torproject.org]

commit fef65fa64341fb70df0e7b34d91d3b08a74e7aad
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 20 15:49:01 2014 -0400

    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)
---
 changes/bug11477     |    4 ++++
 src/common/sandbox.c |    2 ++
 2 files changed, 6 insertions(+)

diff --git a/changes/bug11477 b/changes/bug11477
new file mode 100644
index 0000000..21dd345
--- /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 5c7d8c8..bb2b3ed 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),