June 2013 - tor-commits - lists.torproject.org

[tor/master] Add a changes file for bug 7912
by nickm＠torproject.org 13 Jun '13

13 Jun '13

commit 9b754d1213640882a543f70bb0d6041dfb7a3869 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 13 10:20:30 2013 -0400 Add a changes file for bug 7912 I'm calling it a bugfix on 0.2.0.1-alpha, since that's where cell queues were first introduced. --- changes/bug7912 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/changes/bug7912 b/changes/bug7912 new file mode 100644 index 0000000..48c65d2 --- /dev/null +++ b/changes/bug7912 @@ -0,0 +1,8 @@ + o Major bugfixes: + - Instead of writing destroy cells directly to outgoing connection + buffers, queue them and intersperse them with other outgoing cells. + This can prevent a set of resource starvation conditions where too + many pending destroy cells prevent data cells from actually getting + delivered. Reported by "oftc_must_be_destroyed". Fixes bug 7912; + bugfix on 0.2.0.1-alpha. +

1 0

[tor/master] Merge remote-tracking branch 'public/bug7912_squashed'
by nickm＠torproject.org 13 Jun '13

13 Jun '13

commit 4b781e24fb920ad4cd2268b609e4b4b0bd5adb7d Merge: 2949849 e61df2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 13 10:31:02 2013 -0400 Merge remote-tracking branch 'public/bug7912_squashed' changes/bug7912 | 8 +++ src/or/channel.c | 58 ++++++++++++++++--- src/or/circuitlist.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++---- src/or/circuitlist.h | 5 ++ src/or/circuitmux.c | 135 +++++++++++++++++++++++++++++++++++++++++++-- src/or/circuitmux.h | 8 ++- src/or/or.h | 7 +++ src/or/relay.c | 21 +++++-- src/or/relay.h | 2 +- 9 files changed, 362 insertions(+), 32 deletions(-)

1 0

[tor/master] Fix compile warnings wrt printf formating of int64_t
by nickm＠torproject.org 13 Jun '13

13 Jun '13

commit e61df2ec651345f1c46777105bbae69916402ecd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 13 10:30:34 2013 -0400 Fix compile warnings wrt printf formating of int64_t --- src/or/circuitmux.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index a6256f8..f579c3e 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -539,14 +539,17 @@ circuitmux_free(circuitmux_t *cmux) global_destroy_ctr -= cmux->destroy_cell_queue.n; log_debug(LD_CIRC, "Freeing cmux at %p with %u queued destroys; the last cmux " - "destroy balance was %ld, global is %ld\n", + "destroy balance was "I64_FORMAT", global is "I64_FORMAT, cmux, cmux->destroy_cell_queue.n, - cmux->destroy_ctr, global_destroy_ctr); + I64_PRINTF_ARG(cmux->destroy_ctr), + I64_PRINTF_ARG(global_destroy_ctr)); } else { log_debug(LD_CIRC, "Freeing cmux at %p with no queued destroys, the cmux destroy " - "balance was %ld, global is %ld\n", - cmux, cmux->destroy_ctr, global_destroy_ctr); + "balance was "I64_FORMAT", global is "I64_FORMAT, + cmux, + I64_PRINTF_ARG(cmux->destroy_ctr), + I64_PRINTF_ARG(global_destroy_ctr)); } cell_queue_clear(&cmux->destroy_cell_queue); @@ -1543,9 +1546,11 @@ circuitmux_notify_xmit_destroy(circuitmux_t *cmux) --(cmux->destroy_ctr); --(global_destroy_ctr); log_debug(LD_CIRC, - "Cmux at %p sent a destroy, cmux counter is now %ld, " - "global counter is now %ld\n", - cmux, cmux->destroy_ctr, global_destroy_ctr); + "Cmux at %p sent a destroy, cmux counter is now "I64_FORMAT", " + "global counter is now "I64_FORMAT, + cmux, + I64_PRINTF_ARG(cmux->destroy_ctr), + I64_PRINTF_ARG(global_destroy_ctr)); } /* @@ -1848,9 +1853,11 @@ circuitmux_append_destroy_cell(channel_t *chan, ++(cmux->destroy_ctr); ++global_destroy_ctr; log_debug(LD_CIRC, - "Cmux at %p queued a destroy for circ %u, " - "cmux counter is now %ld, global counter is now %ld\n", - cmux, circ_id, cmux->destroy_ctr, global_destroy_ctr); + "Cmux at %p queued a destroy for circ %u, cmux counter is now " + I64_FORMAT", global counter is now "I64_FORMAT, + cmux, circ_id, + I64_PRINTF_ARG(cmux->destroy_ctr), + I64_PRINTF_ARG(global_destroy_ctr)); /* XXXX Duplicate code from append_cell_to_circuit_queue */ if (!channel_has_queued_writes(chan)) {

1 0

[flashproxy/master] Add another public key for www.google.com.
by dcf＠torproject.org 13 Jun '13

13 Jun '13

commit b48bfc63db523303f7dde5c0c5bc96c68c71f042 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 13 07:19:24 2013 -0700 Add another public key for www.google.com. --- flashproxy-reg-appspot | 1 + 1 file changed, 1 insertion(+) diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index 670cfae..bb9a610 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -65,6 +65,7 @@ A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y PUBKEY_SHA1 = tuple(x.decode("hex") for x in ( "c70ccd442ff4528c603aefef85206fd693990e09", "1697e17a8a3317f031721b7b6293cd50643bbbd3", + "291e750bafedac444486327e50f26f64d840991a", )) class options(object):

1 0

[flashproxy/master] Alignment.
by dcf＠torproject.org 13 Jun '13

13 Jun '13

commit a8074225cbad8f4b86cbe9faa56c30667498b7fc Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 13 07:16:18 2013 -0700 Alignment. --- flashproxy-reg-appspot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flashproxy-reg-appspot b/flashproxy-reg-appspot index e638d09..670cfae 100755 --- a/flashproxy-reg-appspot +++ b/flashproxy-reg-appspot @@ -83,8 +83,8 @@ external IP address is guessed). -6 name lookups use only IPv6. --disable-pin don't check server public key against a known pin. --facilitator-pubkey=FILENAME - encrypt registrations to the given PEM-formatted - public key (default built-in). + encrypt registrations to the given PEM-formatted + public key (default built-in). -h, --help show this help.\ """ % { "progname": sys.argv[0],

1 0

[tor/master] Unmap the microdescriptor cache before replacing it.
by nickm＠torproject.org 13 Jun '13

13 Jun '13

commit f455686b77e4ac686251c6edf1f4a506a369866c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 12 12:04:33 2013 -0400 Unmap the microdescriptor cache before replacing it. This is a reprise of the fix in bdff7e3299d78; 6905c1f6 reintroduced that bug. Briefly: windows doesn't seem to like deleting a mapped file. I tried adding the PROT_SHARED_DELETE flag to the createfile all, but that didn't actually fix this issue. Fortunately, the unit test I added in 4f4fc63fea0589a4fa03f3859dc27860cdde75af should prevent us from making this particular screw-up again. This patch also tries to limit the crash potential of a failure to write by a little bit, although it could do a better job of retaining microdescriptor bodies. Fix for bug 8822, bugfix on 0.2.4.12-alpha. --- changes/bug8822 | 5 +++++ src/or/microdesc.c | 20 +++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/changes/bug8822 b/changes/bug8822 new file mode 100644 index 0000000..c6787af --- /dev/null +++ b/changes/bug8822 @@ -0,0 +1,5 @@ + o Major bugfixes (windows): + - Prevent failures on Windows Vista and later when rebuilding the + microdescriptor cache. Diagnosed by Robert Ransom. Fixes bug 8822; + bugfix on 0.2.4.12-alpha. + diff --git a/src/or/microdesc.c b/src/or/microdesc.c index d9955c7..f99e1c8 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -474,15 +474,29 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) smartlist_add(wrote, md); } + /* We must do this unmap _before_ we call finish_writing_to_file(), or + * windows will not actually replace the file. */ + if (cache->cache_content) + tor_munmap_file(cache->cache_content); + if (finish_writing_to_file(open_file) < 0) { log_warn(LD_DIR, "Error rebuilding microdescriptor cache: %s", strerror(errno)); + /* Okay. Let's prevent from making things worse elsewhere. */ + cache->cache_content = NULL; + HT_FOREACH(mdp, microdesc_map, &cache->map) { + microdesc_t *md = *mdp; + if (md->saved_location == SAVED_IN_CACHE) { + md->off = 0; + md->saved_location = SAVED_NOWHERE; + md->body = NULL; + md->bodylen = 0; + md->no_save = 1; + } + } return -1; } - if (cache->cache_content) - tor_munmap_file(cache->cache_content); - cache->cache_content = tor_mmap_file(cache->cache_fname); if (!cache->cache_content && smartlist_len(wrote)) {

1 0

[tor/master] Make all consumers of microdesc_t.body tolerate NULL
by nickm＠torproject.org 13 Jun '13

13 Jun '13

commit e602c4031b57f0780661ce0473a5e30d187d385c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 12 12:12:11 2013 -0400 Make all consumers of microdesc_t.body tolerate NULL This is another fix to try to mitigate recurrences of 8031/8822. --- src/or/control.c | 6 ++---- src/or/dirserv.c | 2 +- src/or/microdesc.c | 6 +++++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 4878268..5ae7b71 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1711,8 +1711,7 @@ getinfo_helper_dir(control_connection_t *control_conn, const node_t *node = node_get_by_hex_id(question+strlen("md/id/")); const microdesc_t *md = NULL; if (node) md = node->md; - if (md) { - tor_assert(md->body); + if (md && md->body) { *answer = tor_strndup(md->body, md->bodylen); } } else if (!strcmpstart(question, "md/name/")) { @@ -1722,8 +1721,7 @@ getinfo_helper_dir(control_connection_t *control_conn, /* XXXX duplicated code */ const microdesc_t *md = NULL; if (node) md = node->md; - if (md) { - tor_assert(md->body); + if (md && md->body) { *answer = tor_strndup(md->body, md->bodylen); } } else if (!strcmpstart(question, "desc-annotations/id/")) { diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 8f6d9ec..3e46153 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3981,7 +3981,7 @@ connection_dirserv_add_microdescs_to_outbuf(dir_connection_t *conn) char *fp256 = smartlist_pop_last(conn->fingerprint_stack); microdesc_t *md = microdesc_cache_lookup_by_digest256(cache, fp256); tor_free(fp256); - if (!md) + if (!md || !md->body) continue; if (conn->zlib_state) { /* XXXX024 This 'last' business should actually happen on the last diff --git a/src/or/microdesc.c b/src/or/microdesc.c index f99e1c8..05e3b41 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -75,6 +75,10 @@ dump_microdescriptor(int fd, microdesc_t *md, size_t *annotation_len_out) { ssize_t r = 0; size_t written; + if (md->body == NULL) { + *annotation_len_out = 0; + return 0; + } /* XXXX drops unknown annotations. */ if (md->last_listed) { char buf[ISO_TIME_LEN+1]; @@ -447,7 +451,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) HT_FOREACH(mdp, microdesc_map, &cache->map) { microdesc_t *md = *mdp; size_t annotation_len; - if (md->no_save) + if (md->no_save || !md->body) continue; size = dump_microdescriptor(fd, md, &annotation_len);

1 0

[tor/master] Merge remote-tracking branch 'public/bug8822' into maint-0.2.4
by nickm＠torproject.org 13 Jun '13

13 Jun '13

commit 25dddf7a8f30699242b52fce115f29401f63ee9c Merge: 74a534b e602c40 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 13 09:40:32 2013 -0400 Merge remote-tracking branch 'public/bug8822' into maint-0.2.4 changes/bug8822 | 5 +++++ src/or/control.c | 6 ++---- src/or/dirserv.c | 2 +- src/or/microdesc.c | 26 ++++++++++++++++++++++---- 4 files changed, 30 insertions(+), 9 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 13 Jun '13

13 Jun '13

commit 29498491432040168c5df7091097a7b8a9c9ad86 Merge: 8c69207 25dddf7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 13 09:43:53 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8822 | 5 +++++ src/or/control.c | 6 ++---- src/or/dirserv.c | 2 +- src/or/microdesc.c | 26 ++++++++++++++++++++++---- 4 files changed, 30 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.2.4] Unmap the microdescriptor cache before replacing it.
by nickm＠torproject.org 13 Jun '13

13 Jun '13

commit f455686b77e4ac686251c6edf1f4a506a369866c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 12 12:04:33 2013 -0400 Unmap the microdescriptor cache before replacing it. This is a reprise of the fix in bdff7e3299d78; 6905c1f6 reintroduced that bug. Briefly: windows doesn't seem to like deleting a mapped file. I tried adding the PROT_SHARED_DELETE flag to the createfile all, but that didn't actually fix this issue. Fortunately, the unit test I added in 4f4fc63fea0589a4fa03f3859dc27860cdde75af should prevent us from making this particular screw-up again. This patch also tries to limit the crash potential of a failure to write by a little bit, although it could do a better job of retaining microdescriptor bodies. Fix for bug 8822, bugfix on 0.2.4.12-alpha. --- changes/bug8822 | 5 +++++ src/or/microdesc.c | 20 +++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/changes/bug8822 b/changes/bug8822 new file mode 100644 index 0000000..c6787af --- /dev/null +++ b/changes/bug8822 @@ -0,0 +1,5 @@ + o Major bugfixes (windows): + - Prevent failures on Windows Vista and later when rebuilding the + microdescriptor cache. Diagnosed by Robert Ransom. Fixes bug 8822; + bugfix on 0.2.4.12-alpha. + diff --git a/src/or/microdesc.c b/src/or/microdesc.c index d9955c7..f99e1c8 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -474,15 +474,29 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) smartlist_add(wrote, md); } + /* We must do this unmap _before_ we call finish_writing_to_file(), or + * windows will not actually replace the file. */ + if (cache->cache_content) + tor_munmap_file(cache->cache_content); + if (finish_writing_to_file(open_file) < 0) { log_warn(LD_DIR, "Error rebuilding microdescriptor cache: %s", strerror(errno)); + /* Okay. Let's prevent from making things worse elsewhere. */ + cache->cache_content = NULL; + HT_FOREACH(mdp, microdesc_map, &cache->map) { + microdesc_t *md = *mdp; + if (md->saved_location == SAVED_IN_CACHE) { + md->off = 0; + md->saved_location = SAVED_NOWHERE; + md->body = NULL; + md->bodylen = 0; + md->no_save = 1; + } + } return -1; } - if (cache->cache_content) - tor_munmap_file(cache->cache_content); - cache->cache_content = tor_mmap_file(cache->cache_fname); if (!cache->cache_content && smartlist_len(wrote)) {

1 0