March 2015 - tor-commits - lists.torproject.org

[tor/release-0.2.5] Enlarge the buffer for a line in a bw file
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 2b9d48791d0b5245e3ccfd267150dfa34541c87c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jan 7 12:43:21 2015 +0100 Enlarge the buffer for a line in a bw file --- changes/bug14125 | 5 +++++ src/or/dirserv.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug14125 b/changes/bug14125 new file mode 100644 index 0000000..fe6821a --- /dev/null +++ b/changes/bug14125 @@ -0,0 +1,5 @@ + o Minor bugfixes (dirauth): + - Enlarge the buffer to read bw-auth generated files to avoid an + issue when parsing the file in dirserv_read_measured_bandwidths(). + Bugfix on 0.2.2.1-alpha, fixes #14125. + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 49fafaf..03b32cb 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2487,7 +2487,7 @@ int dirserv_read_measured_bandwidths(const char *from_file, smartlist_t *routerstatuses) { - char line[256]; + char line[512]; FILE *fp = tor_fopen_cloexec(from_file, "r"); int applied_lines = 0; time_t file_time, now;

1 0

[tor/release-0.2.5] Avoid attempts to double-remove edge connections from the DNS resolver.
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 905287415b834db1a92205e8436f66a3b2d6846c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 8 11:00:21 2015 -0500 Avoid attempts to double-remove edge connections from the DNS resolver. Also, avoid crashing when we attempt to double-remove an edge connection from the DNS resolver: just log a bug warning instead. Fixes bug 14129. Bugfix on 0d20fee2fbd48978, which was in 0.0.7rc1. jowr found the bug. cypherpunks wrote the fix. I added the log message and removed the assert. --- changes/bug14129 | 7 +++++++ src/or/dns.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/changes/bug14129 b/changes/bug14129 new file mode 100644 index 0000000..6153cd8 --- /dev/null +++ b/changes/bug14129 @@ -0,0 +1,7 @@ + o Major bugfixes (exit node stability): + + - Fix an assertion failure that could occur under high DNS load. Fixes + bug 14129; bugfix on Tor 0.0.7rc1. Found by "jowr"; diagnosed and fixed + by "cypherpunks". + + diff --git a/src/or/dns.c b/src/or/dns.c index fb1b10d..8b6e3b0 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -557,6 +557,8 @@ purge_expired_resolves(time_t now) /* Connections should only be pending if they have no socket. */ tor_assert(!SOCKET_OK(pend->conn->base_.s)); pendconn = pend->conn; + /* Prevent double-remove */ + pendconn->base_.state = EXIT_CONN_STATE_RESOLVEFAILED; if (!pendconn->base_.marked_for_close) { connection_edge_end(pendconn, END_STREAM_REASON_TIMEOUT); circuit_detach_stream(circuit_get_by_edge_conn(pendconn), pendconn); @@ -1132,7 +1134,9 @@ connection_dns_remove(edge_connection_t *conn) return; /* more are pending */ } } - tor_assert(0); /* not reachable unless onlyconn not in pending list */ + log_warn(LD_BUG, "Connection (fd "TOR_SOCKET_T_FORMAT") was not waiting " + "for a resolve of %s, but we tried to remove it.", + conn->base_.s, escaped_safe_str(conn->base_.address)); } }

1 0

[tor/release-0.2.5] When decoding a base-{16, 32, 64} value, clear the target buffer first
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 47760c7ba5f1c87c945f4a018e3b3da6d127a8b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 22 12:56:35 2014 -0500 When decoding a base-{16,32,64} value, clear the target buffer first This is a good idea in case the caller stupidly doesn't check the return value from baseX_decode(), and as a workaround for the current inconsistent API of base16_decode. Prevents any fallout from bug 14013. --- src/common/crypto.c | 6 ++++++ src/common/util.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/common/crypto.c b/src/common/crypto.c index 925beb3..6327614 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2678,6 +2678,8 @@ base64_decode(char *dest, size_t destlen, const char *src, size_t srclen) if (destlen > SIZE_T_CEILING) return -1; + memset(dest, 0, destlen); + EVP_DecodeInit(&ctx); EVP_DecodeUpdate(&ctx, (unsigned char*)dest, &len, (unsigned char*)src, srclen); @@ -2699,6 +2701,8 @@ base64_decode(char *dest, size_t destlen, const char *src, size_t srclen) if (destlen > SIZE_T_CEILING) return -1; + memset(dest, 0, destlen); + /* Iterate over all the bytes in src. Each one will add 0 or 6 bits to the * value we're decoding. Accumulate bits in n, and whenever we have * 24 bits, batch them into 3 bytes and flush those bytes to dest. @@ -2878,6 +2882,8 @@ base32_decode(char *dest, size_t destlen, const char *src, size_t srclen) tor_assert((nbits/8) <= destlen); /* We need enough space. */ tor_assert(destlen < SIZE_T_CEILING); + memset(dest, 0, destlen); + /* Convert base32 encoded chars to the 5-bit values that they represent. */ tmp = tor_malloc_zero(srclen); for (j = 0; j < srclen; ++j) { diff --git a/src/common/util.c b/src/common/util.c index 5eb0f9a..036fd25 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1076,6 +1076,9 @@ base16_decode(char *dest, size_t destlen, const char *src, size_t srclen) return -1; if (destlen < srclen/2 || destlen > SIZE_T_CEILING) return -1; + + memset(dest, 0, destlen); + end = src+srclen; while (src<end) { v1 = hex_decode_digit_(*src);

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.5
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit c9dd2d1a6ad2684442abb7a31e29b0998aaf605c Merge: b08cfc6 9052874 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 12 00:59:29 2015 -0500 Merge remote-tracking branch 'public/bug14129_024' into maint-0.2.5 changes/bug14129 | 7 +++++++ src/or/dns.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.5] Ignore warning for redundant decl in openssl/srtp.h
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 746bb55851433a0709e277ea3e1838d0d9b77d9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jan 10 16:06:25 2015 -0500 Ignore warning for redundant decl in openssl/srtp.h Backports some commits from tor master. --- changes/bug14220 | 4 ++++ src/common/tortls.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/changes/bug14220 b/changes/bug14220 new file mode 100644 index 0000000..51cfa50 --- /dev/null +++ b/changes/bug14220 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Build without warnings with the stock OpenSSL srtp.h header, + which has a duplicate declaration of SSL_get_selected_srtp_profile(). + Fixes bug 14220; this is OpenSSL's bug, not ours. diff --git a/src/common/tortls.c b/src/common/tortls.c index 999d971..d637a8e 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -33,6 +33,20 @@ #include <ws2tcpip.h> #endif #endif + +#ifdef __GNUC__ +#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) +#endif + +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 +#pragma GCC diagnostic push +#endif +/* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in + * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */ +#pragma GCC diagnostic ignored "-Wredundant-decls" +#endif + #include <openssl/ssl.h> #include <openssl/ssl3.h> #include <openssl/err.h> @@ -41,6 +55,14 @@ #include <openssl/bio.h> #include <openssl/opensslv.h> +#if __GNUC__ && GCC_VERSION >= 402 +#if GCC_VERSION >= 406 +#pragma GCC diagnostic pop +#else +#pragma GCC diagnostic warning "-Wredundant-decls" +#endif +#endif + #ifdef USE_BUFFEREVENTS #include <event2/bufferevent_ssl.h> #include <event2/buffer.h>

1 0

[tor/release-0.2.5] Remove needless strdup in addressmap_register_virtual_address()
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit f2fb85f9707a37b15d790386e0283f53d640b16b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 13 12:24:42 2015 -0500 Remove needless strdup in addressmap_register_virtual_address() Fixes bug 14195. Bugfix on 0.1.0.1-rc. --- changes/bug14195 | 3 +++ src/or/addressmap.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug14195 b/changes/bug14195 new file mode 100644 index 0000000..d2b82f3 --- /dev/null +++ b/changes/bug14195 @@ -0,0 +1,3 @@ + o Minor bugfixes (client): + - Fix a memory leak when using AutomapHostsOnResolve. + Fixes bug 14195; bugfix on 0.1.0.1-rc. diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 4253532..d4b7acf 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -951,7 +951,7 @@ addressmap_register_virtual_address(int type, char *new_address) !strcasecmp(new_address, ent->new_address)) { tor_free(new_address); tor_assert(!vent_needs_to_be_added); - return tor_strdup(*addrp); + return *addrp; } else { log_warn(LD_BUG, "Internal confusion: I thought that '%s' was mapped to by "

1 0

[tor/release-0.2.5] Fix a compilation warning in the unit tests
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 2329d9fe3739aca46d00b47222db2f78bd23e4d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 15 12:56:57 2015 -0500 Fix a compilation warning in the unit tests --- src/test/test_relaycell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c index 5deb362..9aff6ab 100644 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@ -104,7 +104,7 @@ test_relaycell_resolved(void *arg) tt_int_op(srm_answer_is_set, ==, 0); \ } \ tt_int_op(srm_ttl, ==, ttl); \ - tt_int_op(srm_expires, ==, expires); \ + tt_i64_op((int64_t)srm_expires, ==, (int64_t)expires); \ } while (0) (void)arg;

1 0

[tor/release-0.2.5] Increase limit for status vote download size by a factor of 5.
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit ceb6dee4652567fd503e5ceb9345354efd935a1b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jan 18 15:25:29 2015 -0500 Increase limit for status vote download size by a factor of 5. We've started to hit the limit here. We introduced the limit in 0.1.2.5-alpha. This fixes bug 14261, but we should have a smarter way to not actually do the behavior this permits. See #14267 for a ticket about fixing that. --- changes/bug14261 | 5 +++++ src/or/directory.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/changes/bug14261 b/changes/bug14261 new file mode 100644 index 0000000..1260ccb --- /dev/null +++ b/changes/bug14261 @@ -0,0 +1,5 @@ + O Minor bugfixes (directory authority): + - Allow directory authorities to fetch more data from one + another if they find themselves missing lots of votes. + Previously, they had been bumping against the 10 MB queued + data limit. Fixes bug 14261. Bugfix on 0.1.2.5-alpha. diff --git a/src/or/directory.c b/src/or/directory.c index 298271f..50863d0 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2183,12 +2183,15 @@ connection_dir_reached_eof(dir_connection_t *conn) */ #define MAX_DIRECTORY_OBJECT_SIZE (10*(1<<20)) +#define MAX_VOTE_DL_SIZE (MAX_DIRECTORY_OBJECT_SIZE * 5) + /** Read handler for directory connections. (That's connections to * directory servers and connections at directory servers.) */ int connection_dir_process_inbuf(dir_connection_t *conn) { + size_t max_size; tor_assert(conn); tor_assert(conn->base_.type == CONN_TYPE_DIR); @@ -2207,7 +2210,11 @@ connection_dir_process_inbuf(dir_connection_t *conn) return 0; } - if (connection_get_inbuf_len(TO_CONN(conn)) > MAX_DIRECTORY_OBJECT_SIZE) { + max_size = + (TO_CONN(conn)->purpose == DIR_PURPOSE_FETCH_STATUS_VOTE) ? + MAX_VOTE_DL_SIZE : MAX_DIRECTORY_OBJECT_SIZE; + + if (connection_get_inbuf_len(TO_CONN(conn)) > max_size) { log_warn(LD_HTTP, "Too much data received from directory connection: " "denial of service attempt, or you need to upgrade?"); connection_mark_for_close(TO_CONN(conn));

1 0

[tor/release-0.2.5] Don't crash on torrc Vi[rtualAddrNetworkIPv[4|6]] with no option value
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit b08cfc65a78527cc97f4d0aeff3217d5f1c93e08 Author: teor <teor2345(a)gmail.com> Date: Sun Jan 11 19:33:04 2015 +1100 Don't crash on torrc Vi[rtualAddrNetworkIPv[4|6]] with no option value Check for a missing option value in parse_virtual_addr_network before asserting on the NULL in tor_addr_parse_mask_ports. This avoids crashing on torrc lines like Vi[rtualAddrNetworkIPv[4|6]] when no value follows the option. Bugfix on 0.2.3 (de4cc126cbb5 on 24 November 2012), fixes #14142. --- changes/bug14142-parse-virtual-addr | 7 +++++++ src/or/addressmap.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/changes/bug14142-parse-virtual-addr b/changes/bug14142-parse-virtual-addr new file mode 100644 index 0000000..f78b7c7 --- /dev/null +++ b/changes/bug14142-parse-virtual-addr @@ -0,0 +1,7 @@ + o Minor bugfixes (client): + - Check for a missing option value in parse_virtual_addr_network + before asserting on the NULL in tor_addr_parse_mask_ports. + This avoids crashing on torrc lines like + Vi[rtualAddrNetworkIPv[4|6]] when no value follows the option. + Bugfix on 0.2.3 (de4cc126cbb5 on 24 November 2012), fixes #14142. + Patch by "teor". diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 998770a..4253532 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -738,6 +738,12 @@ parse_virtual_addr_network(const char *val, sa_family_t family, const int max_bits = ipv6 ? 40 : 16; virtual_addr_conf_t *conf = ipv6 ? &virtaddr_conf_ipv6 : &virtaddr_conf_ipv4; + if (!val || val[0] == '\0') { + if (msg) + tor_asprintf(msg, "Value not present (%s) after VirtualAddressNetwork%s", + val?"Empty":"NULL", ipv6?"IPv6":""); + return -1; + } if (tor_addr_parse_mask_ports(val, 0, &addr, &bits, NULL, NULL) < 0) { if (msg) tor_asprintf(msg, "Error parsing VirtualAddressNetwork%s %s",

1 0

[tor/release-0.2.5] fix another mingw64 unit test warnin
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit ba17cdfb0a80c5f6e86eb7b6e510eb72a9352b83 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 16 11:49:58 2015 -0500 fix another mingw64 unit test warnin --- src/test/test_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 151ec69..225fb79 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -3741,7 +3741,7 @@ test_util_max_mem(void *arg) } else { /* You do not have a petabyte. */ #if SIZEOF_SIZE_T == SIZEOF_UINT64_T - tt_uint_op(memory1, <, (U64_LITERAL(1)<<50)); + tt_u64_op(memory1, <, (U64_LITERAL(1)<<50)); #endif }

1 0