summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-07-05 12:39:40 -0400
committerNick Mathewson <nickm@torproject.org>2016-07-05 12:39:40 -0400
commit74cbbda86e01a40e5cbf7889d5a5bc3445f68510 (patch)
treefc66eb48f21daf1570f1a81669c20d5af15b0467
parent3f33a5b1e7c0be15e37a07ffb301ad746b4b8839 (diff)
parent51b5d09c9406ad58a2ae45b036c381637379fc0a (diff)
downloadtor-74cbbda86e01a40e5cbf7889d5a5bc3445f68510.tar.gz
tor-74cbbda86e01a40e5cbf7889d5a5bc3445f68510.zip
Merge remote-tracking branch 'weasel/bug19556' into maint-0.2.8
-rw-r--r--changes/bug195567
-rw-r--r--src/or/main.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug19556 b/changes/bug19556
new file mode 100644
index 0000000000..f4ac894f46
--- /dev/null
+++ b/changes/bug19556
@@ -0,0 +1,7 @@
+ o Minor bugfixes (sandboxing):
+ - When sandboxing is enabled, we could not write any stats to
+ disk. check_or_create_data_subdir("stats"), which prepares the
+ private stats directory, calls check_private_dir(), which also
+ opens and not just stats() the directory. Therefore, we need to
+ also allow open() for the stats dir in our sandboxing setup.
+ Fixes bug 19556.
diff --git a/src/or/main.c b/src/or/main.c
index f585f0be62..0562f84242 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3568,6 +3568,7 @@ sandbox_init_filter(void)
get_datadir_fname2("keys", "secret_onion_key_ntor.old"));
STAT_DATADIR("keys");
+ OPEN_DATADIR("stats");
STAT_DATADIR("stats");
STAT_DATADIR2("stats", "dirreq-stats");
}