tor

commit eff5e29404980a87b4618e8623c35a363af6cc04
parent 5641e27ffbd1016ed88e05f10319a2b041b5e167
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 19 Jun 2017 13:52:19 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

Diffstat:
A
changes/bug22516
 | 
5
+++++
M
src/common/sandbox.c
 | 
3
+++

2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/changes/bug22516 b/changes/bug22516
@@ -0,0 +1,5 @@
+  o Minor bugfixes (linux seccomp2 sandbox):
+    - Permit the fchmod system call, to avoid crashing on startup when
+      starting with the seccomp2 sandbox and an unexpected set of permissions
+      on the data directory or its contents. Fixes bug 22516; bugfix on
+      0.2.5.4-alpha.
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
@@ -136,6 +136,9 @@ static int filter_nopar_gen[] = {
 #ifdef HAVE_PIPE
     SCMP_SYS(pipe),
 #endif
+#ifdef __NR_fchmod
+    SCMP_SYS(fchmod),
+#endif
     SCMP_SYS(fcntl),
     SCMP_SYS(fstat),
 #ifdef __NR_fstat64