aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-05-20 11:57:03 -0400
committerNick Mathewson <nickm@torproject.org>2014-05-20 11:57:29 -0400
commitf6d3006363f7eabffefce96b814f5a2619f9cbfa (patch)
tree4aef2184d585352d0d47d28fcefdfe9d54845034
parent767b18ea8eebc2c06a2d3d76d7c4e1ac4d70827d (diff)
downloadtor-f6d3006363f7eabffefce96b814f5a2619f9cbfa.tar
tor-f6d3006363f7eabffefce96b814f5a2619f9cbfa.tar.gz
Sandbox: allow access to stats/bridge-stats
Fix for 12041; bugfix on 0.2.5.1-alpha.
-rw-r--r--changes/bug120415
-rw-r--r--src/or/main.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/bug12041 b/changes/bug12041
new file mode 100644
index 000000000..ddbc7de97
--- /dev/null
+++ b/changes/bug12041
@@ -0,0 +1,5 @@
+ o Minor bugfixes (linux syscall sandbox):
+ - Fix a "BUG" warning when trying to write bridge-stats files with
+ the Linux syscall sandbox filter enabled. Fixes bug 12041;
+ bugfix on 0.2.5.1-alpha.
+
diff --git a/src/or/main.c b/src/or/main.c
index a2c5743cf..361a5ef56 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2834,6 +2834,8 @@ sandbox_init_filter(void)
get_datadir_fname2("keys", "secret_onion_key_ntor.old"),
get_datadir_fname2("keys", "secret_onion_key.tmp"),
get_datadir_fname2("keys", "secret_id_key.tmp"),
+ get_datadir_fname2("stats", "bridge-stats"),
+ get_datadir_fname2("stats", "bridge-stats.tmp"),
get_datadir_fname("fingerprint"),
get_datadir_fname("fingerprint.tmp"),
get_datadir_fname("hashed-fingerprint"),
@@ -2850,6 +2852,7 @@ sandbox_init_filter(void)
RENAME_SUFFIX2("keys", "secret_id_key.old", ".tmp");
RENAME_SUFFIX2("keys", "secret_onion_key", ".tmp");
RENAME_SUFFIX2("keys", "secret_onion_key.old", ".tmp");
+ RENAME_SUFFIX2("stats", "bridge_stats", ".tmp");
RENAME_SUFFIX("hashed-fingerprint", ".tmp");
RENAME_SUFFIX("router-stability", ".tmp");
@@ -2862,7 +2865,7 @@ sandbox_init_filter(void)
sandbox_cfg_allow_stat_filename_array(&cfg,
get_datadir_fname("keys"),
- get_datadir_fname("stats/dirreq-stats"),
+ get_datadir_fname2("stats", "dirreq-stats"),
NULL, 0
);
}