September 2012 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'split_routerlist.c_rebased'
by nickm＠torproject.org 14 Sep '12

14 Sep '12

1 0

[tor/master] Reject votes (not consensuses) with >64 known-flags
by nickm＠torproject.org 14 Sep '12

14 Sep '12

commit c8b98ba41ce37662cf14fdb3c6a74ae83b8b0bf8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 11:45:05 2012 -0400 Reject votes (not consensuses) with >64 known-flags Our flag voting code needs to handle unrecognized flags, so it stores them in a 64-bit bitfield. But we never actually checked for too many flags, so we were potentially doing stuff like U64_LITERAL(1)<<flagnum with flagnum >= 64. That's undefined behavior. Fix for bug 6833; bugfix on 0.2.0.1-alpha. --- changes/bug6833 | 4 ++++ src/or/or.h | 3 +++ src/or/routerparse.c | 5 +++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/changes/bug6833 b/changes/bug6833 new file mode 100644 index 0000000..4a6a5d3 --- /dev/null +++ b/changes/bug6833 @@ -0,0 +1,4 @@ + o Minor bugfixes (directory authority): + - Reject consensus votes with more than 64 known-flags. We aren't even + close to that limit yet, and our code doesn't handle it + correctly. Fixes bug 6833; bugfix on 0.2.0.1-alpha. diff --git a/src/or/or.h b/src/or/or.h index bb5482b..f7914b8 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2101,6 +2101,9 @@ typedef struct vote_microdesc_hash_t { typedef struct vote_routerstatus_t { routerstatus_t status; /**< Underlying 'status' object for this router. * Flags are redundant. */ + /** How many known-flags are allowed in a vote? This is the width of + * the flags field of vote_routerstatus_t */ +#define MAX_KNOWN_FLAGS_IN_VOTE 64 uint64_t flags; /**< Bit-field for all recognized flags; index into * networkstatus_t.known_flags. */ char *version; /**< The version that the authority says this router is diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 22f7d78..496b90d 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3004,6 +3004,11 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, log_warn(LD_DIR, "known-flags not in order"); goto err; } + if (ns->type != NS_TYPE_CONSENSUS && + smartlist_len(ns->known_flags) > MAX_KNOWN_FLAGS_IN_VOTE) { + log_warn(LD_DIR, "Too many known-flags in consensus vote or opinion"); + goto err; + } tok = find_opt_by_keyword(tokens, K_PARAMS); if (tok) {

1 0

[tor/master] document why we only allow 64 flags in votes
by nickm＠torproject.org 14 Sep '12

14 Sep '12

commit 68caa834f4ed9cae16a551c9fc63ea982c9f1904 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 10:10:16 2012 -0400 document why we only allow 64 flags in votes --- src/or/routerparse.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 496b90d..43a95e8 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3006,6 +3006,11 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, } if (ns->type != NS_TYPE_CONSENSUS && smartlist_len(ns->known_flags) > MAX_KNOWN_FLAGS_IN_VOTE) { + /* If we allowed more than 64 flags in votes, then parsing them would make + * us invoke undefined behavior whenever we used 1<<flagnum to do a + * bit-shift. This is only for votes and opinions: consensus users don't + * care about flags they don't recognize, and so don't build a bitfield + * for them. */ log_warn(LD_DIR, "Too many known-flags in consensus vote or opinion"); goto err; }

1 0

[tor/master] Merge branch 'bug6833'
by nickm＠torproject.org 14 Sep '12

14 Sep '12

commit 286e95f0a5dcebe226f7b1c3372de540b75ea460 Merge: e4ce8cd 68caa83 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 10:10:23 2012 -0400 Merge branch 'bug6833' changes/bug6833 | 4 ++++ src/or/or.h | 3 +++ src/or/routerparse.c | 10 ++++++++++ 3 files changed, 17 insertions(+), 0 deletions(-)

1 0

[tor/master] Remove a duplicate test in test_util_pow2
by nickm＠torproject.org 14 Sep '12

14 Sep '12

commit 56bd3dd87ff35863ca0fd21aab339d65ba839479 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 10:00:47 2012 -0400 Remove a duplicate test in test_util_pow2 --- src/test/test_util.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 2a194ef..2c65903 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1131,7 +1131,6 @@ test_util_pow2(void) test_eq(round_to_power_of_2(2), 2); test_eq(round_to_power_of_2(3), 2); test_eq(round_to_power_of_2(4), 4); - test_eq(round_to_power_of_2(4), 4); test_eq(round_to_power_of_2(5), 4); test_eq(round_to_power_of_2(6), 4); test_eq(round_to_power_of_2(7), 8);

1 0

[tor/master] Fix compilation with older gccs
by nickm＠torproject.org 14 Sep '12

14 Sep '12

commit e4ce8cd9691708d9bc0bcc9904d656fe35001946 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 10:06:00 2012 -0400 Fix compilation with older gccs They don't like to have #preprocessor directives inside macro arguments. Fixes #6842; fix on 0.2.4.2-alpha. Found by grarpamp. --- changes/old_gcc_macro_fix | 5 +++++ src/common/util.c | 10 ++++++---- src/or/main.c | 9 +++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/changes/old_gcc_macro_fix b/changes/old_gcc_macro_fix new file mode 100644 index 0000000..5fc0a47 --- /dev/null +++ b/changes/old_gcc_macro_fix @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix building with older versions of GCC that don't like preprocessor + directives inside macro arguments. Found by grarpamp. Fixes bug 6842; + bugfix on 0.2.4.2-alpha. + diff --git a/src/common/util.c b/src/common/util.c index 0e0dcb1..d4d7cb3 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3923,13 +3923,15 @@ tor_process_handle_destroy(process_handle_t *process_handle, if (also_terminate_process) { if (tor_terminate_process(process_handle) < 0) { - log_notice(LD_GENERAL, "Failed to terminate process with " - "PID '%d' ('%s').", tor_process_get_pid(process_handle), + const char *errstr = #ifdef _WIN32 - format_win32_error(GetLastError())); + format_win32_error(GetLastError()); #else - strerror(errno)); + strerror(errno); #endif + log_notice(LD_GENERAL, "Failed to terminate process with " + "PID '%d' ('%s').", tor_process_get_pid(process_handle), + errstr); } else { log_info(LD_GENERAL, "Terminated process with PID '%d'.", tor_process_get_pid(process_handle)); diff --git a/src/or/main.c b/src/or/main.c index 01da7a4..635dcb4 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2309,13 +2309,14 @@ tor_init(int argc, char *argv[]) { const char *version = get_version(); - log_notice(LD_GENERAL, "Tor v%s %srunning on %s with Libevent %s " - "and OpenSSL %s.", version, + const char *bev_str = #ifdef USE_BUFFEREVENTS - "(with bufferevents) ", + "(with bufferevents) "; #else - "", + ""; #endif + log_notice(LD_GENERAL, "Tor v%s %srunning on %s with Libevent %s " + "and OpenSSL %s.", version, bev_str, get_uname(), tor_libevent_get_version_str(), crypto_openssl_get_version_str());

1 0

[tor/master] Don't compute ((uint64_t)1)<<64 in round_to_power_of_2
by nickm＠torproject.org 14 Sep '12

14 Sep '12

commit 37953497d8689bdde65837b00f56bf8ff1e0e459 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 13 10:34:49 2012 -0400 Don't compute ((uint64_t)1)<<64 in round_to_power_of_2 This would be undefined behavior if it happened. (It can't actually happen as we're using round_to_power_of_2, since we would have to be trying to allocate exabytes of data.) While we're at it, fix the behavior of round_to_power_of_2(0), and document the function better. Fix for bug 6831. --- changes/bug6831 | 4 ++++ src/common/util.c | 18 +++++++++++++++--- src/test/test_util.c | 13 ++++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/changes/bug6831 b/changes/bug6831 new file mode 100644 index 0000000..ac4775b --- /dev/null +++ b/changes/bug6831 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix round_to_power_of_2 so it doesn't invoke undefined behavior + with large values. This was untriggered, but nevertheless incorrect. + Fixes bug 6831; bugfix on 0.2.0.1-alpha. diff --git a/src/common/util.c b/src/common/util.c index 84b3150..0e0dcb1 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -394,12 +394,24 @@ tor_log2(uint64_t u64) return r; } -/** Return the power of 2 closest to <b>u64</b>. */ +/** Return the power of 2 in range [1,UINT64_MAX] closest to <b>u64</b>. If + * there are two powers of 2 equally close, round down. */ uint64_t round_to_power_of_2(uint64_t u64) { - int lg2 = tor_log2(u64); - uint64_t low = U64_LITERAL(1) << lg2, high = U64_LITERAL(1) << (lg2+1); + int lg2; + uint64_t low; + uint64_t high; + if (u64 == 0) + return 1; + + lg2 = tor_log2(u64); + low = U64_LITERAL(1) << lg2; + + if (lg2 == 63) + return low; + + high = U64_LITERAL(1) << (lg2+1); if (high - u64 < u64 - low) return high; else diff --git a/src/test/test_util.c b/src/test/test_util.c index 7ef4d1f..2a194ef 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1109,6 +1109,7 @@ test_util_pow2(void) test_eq(tor_log2(64), 6); test_eq(tor_log2(65), 6); test_eq(tor_log2(63), 5); + test_eq(tor_log2(0), 0); /* incorrect mathematically, but as specified */ test_eq(tor_log2(1), 0); test_eq(tor_log2(2), 1); test_eq(tor_log2(3), 1); @@ -1123,7 +1124,17 @@ test_util_pow2(void) test_eq(round_to_power_of_2(130), 128); test_eq(round_to_power_of_2(U64_LITERAL(40000000000000000)), U64_LITERAL(1)<<55); - test_eq(round_to_power_of_2(0), 2); + test_eq(round_to_power_of_2(U64_LITERAL(0xffffffffffffffff)), + U64_LITERAL(1)<<63); + test_eq(round_to_power_of_2(0), 1); + test_eq(round_to_power_of_2(1), 1); + test_eq(round_to_power_of_2(2), 2); + test_eq(round_to_power_of_2(3), 2); + test_eq(round_to_power_of_2(4), 4); + test_eq(round_to_power_of_2(4), 4); + test_eq(round_to_power_of_2(5), 4); + test_eq(round_to_power_of_2(6), 4); + test_eq(round_to_power_of_2(7), 8); done: ;

1 0

[tor/master] Merge branch 'bug6831_v2'
by nickm＠torproject.org 14 Sep '12

14 Sep '12

commit 6492a75b9f23ff4d22aa4b4ffa2fe4a4f7193bad Merge: 9ab3b33 3795349 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 09:54:08 2012 -0400 Merge branch 'bug6831_v2' changes/bug6831 | 4 ++++ src/common/util.c | 18 +++++++++++++++--- src/test/test_util.c | 13 ++++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-)

1 0

[tor/master] Fix man page typo
by arma＠torproject.org 14 Sep '12

14 Sep '12

commit 909691f1ae9e2b8cd806cdf43b43f99b97c5c0f4 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Sep 13 23:25:03 2012 -0700 Fix man page typo --- doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 0bd9709..5aac054 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -81,7 +81,7 @@ COMMAND-LINE OPTIONS Other options can be specified on the command-line in the format "--option value", in the format "option value", or in a configuration file. For instance, you can tell Tor to start listening for SOCKS connections on port -9999 by passing --SOCKSPort 9999 or SOCKPort 9999 to it on the command line, +9999 by passing --SOCKSPort 9999 or SOCKSPort 9999 to it on the command line, or by putting "SOCKSPort 9999" in the configuration file. You will need to quote options with spaces in them: if you want Tor to log all debugging messages to debug.log, you will probably need to say --Log 'debug file

1 0

[tor/master] Merge branch 'maint-0.2.3'
by arma＠torproject.org 14 Sep '12

14 Sep '12

commit 9ab3b332aec076451dd93d11ce7ce1fd81ff7294 Merge: abbde7b 909691f Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Sep 14 02:41:13 2012 -0400 Merge branch 'maint-0.2.3' doc/tor.1.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0