[tor-commits] [tor/master] sandbox: Permit access to stats/dirreq-stats

[nickm at torproject.org]

commit f87071f49efb47a2d52583730c29ba287e620227
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 20 12:06:08 2014 -0400

    sandbox: Permit access to stats/dirreq-stats
    
    This prevents a crash when rotating logs with dirreq-stats enabled
    
    fixes 12035; bugfix on 0.2.5.1-alpha.
---
 changes/12032 |    4 ++++
 src/or/main.c |    3 +++
 2 files changed, 7 insertions(+)

diff --git a/changes/12032 b/changes/12032
new file mode 100644
index 0000000..c51ddb8
--- /dev/null
+++ b/changes/12032
@@ -0,0 +1,4 @@
+  o Minor bugfixes (linux syscall sandbox):
+    - Avoid crash when running with sandboxing enabled and
+      DirReqStatistics not disabled. Fixes bug 12035; bugfix on
+      0.2.5.1-alpha.
\ No newline at end of file
diff --git a/src/or/main.c b/src/or/main.c
index 3e41154..dac178a 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2836,6 +2836,8 @@ sandbox_init_filter(void)
         get_datadir_fname2("keys", "secret_id_key.tmp"),
         get_datadir_fname2("stats", "bridge-stats"),
         get_datadir_fname2("stats", "bridge-stats.tmp"),
+        get_datadir_fname2("stats", "dirreq-stats"),
+        get_datadir_fname2("stats", "dirreq-stats.tmp"),
         get_datadir_fname("fingerprint"),
         get_datadir_fname("fingerprint.tmp"),
         get_datadir_fname("hashed-fingerprint"),
@@ -2853,6 +2855,7 @@ sandbox_init_filter(void)
     RENAME_SUFFIX2("keys", "secret_onion_key", ".tmp");
     RENAME_SUFFIX2("keys", "secret_onion_key.old", ".tmp");
     RENAME_SUFFIX2("stats", "bridge-stats", ".tmp");
+    RENAME_SUFFIX2("stats", "dirreq-stats", ".tmp");
     RENAME_SUFFIX("hashed-fingerprint", ".tmp");
     RENAME_SUFFIX("router-stability", ".tmp");