April 2014 - tor-commits - lists.torproject.org

[orbot/master] fix for binary version upgrade support
by n8fr8＠torproject.org 08 Apr '14

08 Apr '14

commit fc0554f9ff9f4f4f1d7940ab5dfc2e8fe4148841 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Apr 7 23:35:58 2014 -0400 fix for binary version upgrade support --- src/org/torproject/android/service/TorService.java | 27 +++++++++++++++----- .../android/service/TorServiceConstants.java | 2 +- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 1cede61..23c0a4c 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -525,10 +525,26 @@ public class TorService extends Service implements TorServiceConstants, TorConst fileXtables = new File(appBinHome, IPTABLES_ASSET_KEY); - if (!fileTorRc.exists()) + SharedPreferences prefs = getSharedPrefs(getApplicationContext()); + String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null); + + if (version == null || (!version.equals(BINARY_TOR_VERSION))) + { + stopTor(); + + TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); + boolean success = installer.installResources(); + + prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit(); + } + else if (!fileTorRc.exists()) { + stopTor(); + TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome); boolean success = installer.installResources(); + + prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit(); } @@ -608,8 +624,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (mTransProxy == null) { - mTransProxy = new TorTransProxy(this); - mTransProxy.setXTables(fileXtables); + mTransProxy = new TorTransProxy(this, fileXtables); + + } logMessage ("Transparent Proxying: enabling..."); @@ -668,7 +685,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst logMessage ("Transparent Proxying: disabling..."); if (mTransProxy == null) - mTransProxy = new TorTransProxy(this); + mTransProxy = new TorTransProxy(this, fileXtables); mTransProxy.clearTransparentProxyingAll(this); @@ -1156,10 +1173,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst public IBinder onBind(Intent intent) { - _torInstance = this; - Thread thread = new Thread () { diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index bd1c64c..db73e70 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -80,7 +80,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.4.21"; + public static final String BINARY_TOR_VERSION = "0.2.4.21-openssl1.0.1g"; public static final String BINARY_PRIVOXY_VERSION = "3.0.12"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INTALLED"; public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INTALLED";

1 0

[tor/master] Fix some harmless/untriggerable memory leaks found by coverity
by nickm＠torproject.org 08 Apr '14

08 Apr '14

commit f0bce2dc359dc2b3004af33541b27c495ad731f3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 7 23:20:13 2014 -0400 Fix some harmless/untriggerable memory leaks found by coverity --- changes/cov-leaks | 6 ++++++ src/or/dirserv.c | 16 ++++++++-------- src/test/test_addr.c | 2 +- src/test/test_util.c | 28 +++++++++++++++------------- src/tools/tor-gencert.c | 3 +++ 5 files changed, 33 insertions(+), 22 deletions(-) diff --git a/changes/cov-leaks b/changes/cov-leaks new file mode 100644 index 0000000..302d247 --- /dev/null +++ b/changes/cov-leaks @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Resolve some memory leaks found by coverity in the unit tests, + on exit in tor-gencert, and on a failure to compute digests + for our own keys when generating a v3 networkstatus vote. + These leaks should never have affected anyone in practice. + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index b6c5dd4..f5994e0 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2578,14 +2578,6 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, tor_assert(private_key); tor_assert(cert); - if (resolve_my_address(LOG_WARN, options, &addr, NULL, &hostname)<0) { - log_warn(LD_NET, "Couldn't resolve my hostname"); - return NULL; - } - if (!hostname || !strchr(hostname, '.')) { - tor_free(hostname); - hostname = tor_dup_ip(addr); - } if (crypto_pk_get_digest(private_key, signing_key_digest)<0) { log_err(LD_BUG, "Error computing signing key digest"); return NULL; @@ -2594,6 +2586,14 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, log_err(LD_BUG, "Error computing identity key digest"); return NULL; } + if (resolve_my_address(LOG_WARN, options, &addr, NULL, &hostname)<0) { + log_warn(LD_NET, "Couldn't resolve my hostname"); + return NULL; + } + if (!hostname || !strchr(hostname, '.')) { + tor_free(hostname); + hostname = tor_dup_ip(addr); + } if (options->VersioningAuthoritativeDir) { client_versions = format_versions_list(options->RecommendedClientVersions); diff --git a/src/test/test_addr.c b/src/test/test_addr.c index eb25e0b..cee2dcf 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -73,7 +73,7 @@ test_addr_basic(void) } done: - ; + tor_free(cp); } #define test_op_ip6_(a,op,b,e1,e2) \ diff --git a/src/test/test_util.c b/src/test/test_util.c index 877fa84..08efd45 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1189,19 +1189,19 @@ test_util_strmisc(void) } /* Test str-foo functions */ - cp = tor_strdup("abcdef"); - test_assert(tor_strisnonupper(cp)); - cp[3] = 'D'; - test_assert(!tor_strisnonupper(cp)); - tor_strupper(cp); - test_streq(cp, "ABCDEF"); - tor_strlower(cp); - test_streq(cp, "abcdef"); - test_assert(tor_strisnonupper(cp)); - test_assert(tor_strisprint(cp)); - cp[3] = 3; - test_assert(!tor_strisprint(cp)); - tor_free(cp); + cp_tmp = tor_strdup("abcdef"); + test_assert(tor_strisnonupper(cp_tmp)); + cp_tmp[3] = 'D'; + test_assert(!tor_strisnonupper(cp_tmp)); + tor_strupper(cp_tmp); + test_streq(cp_tmp, "ABCDEF"); + tor_strlower(cp_tmp); + test_streq(cp_tmp, "abcdef"); + test_assert(tor_strisnonupper(cp_tmp)); + test_assert(tor_strisprint(cp_tmp)); + cp_tmp[3] = 3; + test_assert(!tor_strisprint(cp_tmp)); + tor_free(cp_tmp); /* Test memmem and memstr */ { @@ -2325,6 +2325,8 @@ test_util_listdir(void *ptr) done: tor_free(fname1); tor_free(fname2); + tor_free(fname3); + tor_free(dir1); tor_free(dirname); if (dir_contents) { SMARTLIST_FOREACH(dir_contents, char *, cp, tor_free(cp)); diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index 2f95cf7..d0c30b8 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -547,6 +547,9 @@ main(int argc, char **argv) if (signing_key) EVP_PKEY_free(signing_key); tor_free(address); + tor_free(identity_key_file); + tor_free(signing_key_file); + tor_free(certificate_file); crypto_global_cleanup(); return r;

1 0

[tor/master] Merge remote-tracking branch 'public/bug10363_024_squashed'
by nickm＠torproject.org 08 Apr '14

08 Apr '14

commit 595303fd1e1998e12c51901f1aea77311e973a44 Merge: 84df7d7 6d9c332 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 7 23:03:04 2014 -0400 Merge remote-tracking branch 'public/bug10363_024_squashed' changes/bug10363 | 12 ++++++++++++ src/common/compat.c | 20 ++++++++++++++------ src/ext/eventdns.c | 5 +++-- src/or/channeltls.c | 23 +++++++++++++++-------- src/test/test_util.c | 4 ++++ 5 files changed, 48 insertions(+), 16 deletions(-)

1 0

[tor/master] Fix undefined behavior with pointer addition in channeltls.c
by nickm＠torproject.org 08 Apr '14

08 Apr '14

commit 092ac26ea28c17d13bd1d01cab9b3dec276c4dbc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 11 14:45:48 2013 -0500 Fix undefined behavior with pointer addition in channeltls.c In C, it's a bad idea to do this: char *cp = array; char *end = array + array_len; /* .... */ if (cp + 3 >= end) { /* out of bounds */ } because cp+3 might be more than one off the end of the array, and you are only allowed to construct pointers to the array elements, and to an element one past the end. Instead you have to say if (cp - array + 3 >= array_len) { /* ... */ } or something like that. This patch fixes two of these: one in process_versions_cell introduced in 0.2.0.10-alpha, and one in process_certs_cell introduced in 0.2.3.6-alpha. These are both tracked under bug 10363. "bobnomnom" found and reported both. See also 10313. In our code, this is likely to be a problem as we used it only if we get a nasty allocator that makes allocations end close to (void*)-1. But it's best not to have to worry about such things at all, so let's just fix all of these we can find. --- changes/bug10363 | 6 ++++++ src/or/channeltls.c | 23 +++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/changes/bug10363 b/changes/bug10363 new file mode 100644 index 0000000..cf5b7fd --- /dev/null +++ b/changes/bug10363 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Fix two instances of possible undefined behavior in channeltls.c + that could, under unlucky circumstances, have led to a pointer + overflow. Fixes bug #10363; bugfixes on 0.2.0.10-alpha and + 0.2.3.6-alpha. Reported by "bobnomnom". + diff --git a/src/or/channeltls.c b/src/or/channeltls.c index f751c0d..d59083b 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1174,7 +1174,6 @@ static void channel_tls_process_versions_cell(var_cell_t *cell, channel_tls_t *chan) { int highest_supported_version = 0; - const uint8_t *cp, *end; int started_here = 0; tor_assert(cell); @@ -1206,11 +1205,15 @@ channel_tls_process_versions_cell(var_cell_t *cell, channel_tls_t *chan) } tor_assert(chan->conn->handshake_state); - end = cell->payload + cell->payload_len; - for (cp = cell->payload; cp+1 < end; cp += 2) { - uint16_t v = ntohs(get_uint16(cp)); - if (is_or_protocol_version_known(v) && v > highest_supported_version) - highest_supported_version = v; + + { + int i; + const uint8_t *cp = cell->payload; + for (i = 0; i < cell->payload_len / 2; ++i, cp += 2) { + uint16_t v = ntohs(get_uint16(cp)); + if (is_or_protocol_version_known(v) && v > highest_supported_version) + highest_supported_version = v; + } } if (!highest_supported_version) { log_fn(LOG_PROTOCOL_WARN, LD_OR, @@ -1567,12 +1570,16 @@ channel_tls_process_certs_cell(var_cell_t *cell, channel_tls_t *chan) for (i = 0; i < n_certs; ++i) { uint8_t cert_type; uint16_t cert_len; - if (ptr + 3 > cell->payload + cell->payload_len) { + if (cell->payload_len < 3) + goto truncated; + if (ptr > cell->payload + cell->payload_len - 3) { goto truncated; } cert_type = *ptr; cert_len = ntohs(get_uint16(ptr+1)); - if (ptr + 3 + cert_len > cell->payload + cell->payload_len) { + if (cell->payload_len < 3 + cert_len) + goto truncated; + if (ptr > cell->payload + cell->payload_len - cert_len - 3) { goto truncated; } if (cert_type == OR_CERT_TYPE_TLS_LINK ||

1 0

[tor/master] Another 10363 instance: this one in tor_memmem fallback code
by nickm＠torproject.org 08 Apr '14

08 Apr '14

commit 9dd115d6b59aaa7d2f444efb9d7992e472fbfb0f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 11 15:14:43 2013 -0500 Another 10363 instance: this one in tor_memmem fallback code --- changes/bug10363 | 3 +++ src/common/compat.c | 20 ++++++++++++++------ src/test/test_util.c | 4 ++++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/changes/bug10363 b/changes/bug10363 index cf5b7fd..a3c9905 100644 --- a/changes/bug10363 +++ b/changes/bug10363 @@ -3,4 +3,7 @@ that could, under unlucky circumstances, have led to a pointer overflow. Fixes bug #10363; bugfixes on 0.2.0.10-alpha and 0.2.3.6-alpha. Reported by "bobnomnom". + - Fix another possibly undefined pointer operations in tor_memmem + fallback implementation. Another case of bug #10363; bugfix on + 0.1.1.1-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index d88c5f9..9b8a0a4 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -498,21 +498,29 @@ tor_memmem(const void *_haystack, size_t hlen, #else /* This isn't as fast as the GLIBC implementation, but it doesn't need to * be. */ - const char *p, *end; + const char *p, *last_possible_start; const char *haystack = (const char*)_haystack; const char *needle = (const char*)_needle; char first; tor_assert(nlen); + if (nlen > hlen) + return NULL; + p = haystack; - end = haystack + hlen; + /* Last position at which the needle could start. */ + last_possible_start = haystack + hlen - nlen; first = *(const char*)needle; - while ((p = memchr(p, first, end-p))) { - if (p+nlen > end) - return NULL; + while ((p = memchr(p, first, last_possible_start + 1 - p))) { if (fast_memeq(p, needle, nlen)) return p; - ++p; + if (++p > last_possible_start) { + /* This comparison shouldn't be necessary, since if p was previously + * equal to last_possible_start, the next memchr call would be + * "memchr(p, first, 0)", which will return NULL. But it clarifies the + * logic. */ + return NULL; + } } return NULL; #endif diff --git a/src/test/test_util.c b/src/test/test_util.c index 65d9d2f..bf87db7 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1045,6 +1045,10 @@ test_util_strmisc(void) test_assert(!tor_memmem(haystack, 4, "cde", 3)); haystack = "ababcad"; test_eq_ptr(tor_memmem(haystack, 7, "abc", 3), haystack + 2); + test_eq_ptr(tor_memmem(haystack, 7, "ad", 2), haystack + 5); + test_eq_ptr(tor_memmem(haystack, 7, "cad", 3), haystack + 4); + test_assert(!tor_memmem(haystack, 7, "dadad", 5)); + test_assert(!tor_memmem(haystack, 7, "abcdefghij", 10)); /* memstr */ test_eq_ptr(tor_memstr(haystack, 7, "abc"), haystack + 2); test_eq_ptr(tor_memstr(haystack, 7, "cad"), haystack + 4);

1 0

[tor/master] Another 10363 instance -- this one in the eventdns.c code
by nickm＠torproject.org 08 Apr '14

08 Apr '14

commit 6d9c332757c96e691ddeb024bd41035490a505d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 11 15:15:21 2013 -0500 Another 10363 instance -- this one in the eventdns.c code --- changes/bug10363 | 3 +++ src/ext/eventdns.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug10363 b/changes/bug10363 index a3c9905..0cdfd9a 100644 --- a/changes/bug10363 +++ b/changes/bug10363 @@ -6,4 +6,7 @@ - Fix another possibly undefined pointer operations in tor_memmem fallback implementation. Another case of bug #10363; bugfix on 0.1.1.1-alpha. + - Fix another possibly undefined pointer operations in the eventdns + fallback implementation. Another case of bug #10363; bugfix on + 0.1.2.1-alpha. diff --git a/src/ext/eventdns.c b/src/ext/eventdns.c index 66280cc..a64c562 100644 --- a/src/ext/eventdns.c +++ b/src/ext/eventdns.c @@ -842,10 +842,11 @@ name_parse(u8 *packet, int length, int *idx, char *name_out, size_t name_out_len } if (label_len > 63) return -1; if (cp != name_out) { - if (cp + 1 >= end) return -1; + if (cp >= name_out + name_out_len - 1) return -1; *cp++ = '.'; } - if (cp + label_len >= end) return -1; + if (label_len > name_out_len || + cp >= name_out + name_out_len - label_len) return -1; memcpy(cp, packet + j, label_len); cp += label_len; j += label_len;

1 0

[torspec/master] Document new PT_MISSING reason for ending an OR_CONN
by nickm＠torproject.org 08 Apr '14

08 Apr '14

commit 358e8ac97811ff2ad6de34f84fb59a92612b4a08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 7 22:22:57 2014 -0400 Document new PT_MISSING reason for ending an OR_CONN (See #9665 for more background.) --- control-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index f9c4934..08ece42 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1535,7 +1535,7 @@ Reason = "MISC" / "DONE" / "CONNECTREFUSED" / "IDENTITY" / "CONNECTRESET" / "TIMEOUT" / "NOROUTE" / - "IOERROR" / "RESOURCELIMIT" + "IOERROR" / "RESOURCELIMIT" / "PT_MISSING" NumCircuits counts both established and pending circuits. @@ -1565,6 +1565,7 @@ IOERROR -- We got some other IO error on our connection to the OR. RESOURCELIMIT -- We don't have enough operating system resources (file descriptors, buffers, etc) to connect to the OR. + PT_MISSING -- No pluggable transport was available. MISC -- The OR connection closed for some other reason. [First added ID parameter in 0.2.5.2-alpha]

1 0

[tor/master] Changes file for bug9665
by nickm＠torproject.org 08 Apr '14

08 Apr '14

commit 74195db6b67d2e98019104d49e44717fd54d5ec2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 7 22:19:56 2014 -0400 Changes file for bug9665 --- changes/bug9665 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug9665 b/changes/bug9665 new file mode 100644 index 0000000..d9e5859 --- /dev/null +++ b/changes/bug9665 @@ -0,0 +1,4 @@ + o Minor features: + - Report a failure to connect to a bridge because its transport + type has no configured pluggable transport as a new type of bootstrap + failure. Resolves ticket 9665. Patch from Fábio J. Bertinatto.

1 0

[tor/master] Forward-port bug9665 fix to work with our fix for 11069
by nickm＠torproject.org 08 Apr '14

08 Apr '14

commit 754a50592c412d95d2eb48038784d0ef725a7dc2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 7 13:41:07 2014 -0400 Forward-port bug9665 fix to work with our fix for 11069 --- src/or/connection_or.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index ba3ac00..01ff4dc 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1198,7 +1198,8 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, control_event_bootstrap_problem( "Can't connect to bridge", - END_OR_CONN_REASON_NO_ROUTE); + END_OR_CONN_REASON_NO_ROUTE, + conn); } else { log_warn(LD_GENERAL, "Tried to connect to '%s' through a proxy, but "

1 0

[tor/master] Fix bug9665
by nickm＠torproject.org 08 Apr '14

08 Apr '14

commit 08ae53e400ff6fa2d8147aad440c38173c106cae Author: Fábio J. Bertinatto <fabiojrb(a)gmail.com> Date: Tue Nov 5 00:50:16 2013 -0200 Fix bug9665 --- src/or/connection_or.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 04ad2cc..ba3ac00 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1195,6 +1195,11 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, "your pluggable transport proxy stopped running.", fmt_addrport(&TO_CONN(conn)->addr, TO_CONN(conn)->port), transport_name, transport_name); + + control_event_bootstrap_problem( + "Can't connect to bridge", + END_OR_CONN_REASON_NO_ROUTE); + } else { log_warn(LD_GENERAL, "Tried to connect to '%s' through a proxy, but " "the proxy address could not be found.",

1 0