- tor-commits - lists.torproject.org

[tor/release-0.2.3] Merge branch 'bug5099_nm' into maint-0.2.3
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit d0243e82cfcdf6684283c37f20db2d999740bdf3 Merge: ebda15e f54ac08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:10:57 2012 -0400 Merge branch 'bug5099_nm' into maint-0.2.3 changes/bug5099 | 3 +++ src/or/transports.c | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.3] Resolve crash caused by format_helper_exit_status changes in #5557
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit b1ad1a1d0266a20bb0dac15e65abe7b65a74e8a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:30:01 2012 -0400 Resolve crash caused by format_helper_exit_status changes in #5557 Because the string output was no longer equal in length to HEX_ERRNO_SIZE, the write() call would add some extra spaces and maybe a NUL, and the NUL would trigger an assert in get_string_from_pipe. Fixes bug 6225; bug not in any released version of Tor. --- src/common/util.c | 29 ++++++++++++++++++++--------- src/common/util.h | 4 ++-- src/test/test_util.c | 16 +++++++++++----- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index cb8ff85..8cb013e 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3264,8 +3264,11 @@ format_hex_number_for_helper_exit_status(unsigned int x, char *buf, * in the processs of starting the child process did the failure occur (see * CHILD_STATE_* macros for definition), and SAVED_ERRNO is the value of * errno when the failure occurred. + * + * On success return the number of characters added to hex_errno, not counting + * the terminating NUL; return -1 on error. */ -void +int format_helper_exit_status(unsigned char child_state, int saved_errno, char *hex_errno) { @@ -3273,6 +3276,7 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, int written, left; char *cur; size_t i; + int res = -1; /* Fill hex_errno with spaces, and a trailing newline (memset may not be signal handler safe, so we can't use it) */ @@ -3343,6 +3347,8 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, *cur++ = '\n'; *cur++ = '\0'; + res = cur - hex_errno - 1; + goto done; err: @@ -3353,7 +3359,7 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, *hex_errno = '\0'; done: - return; + return res; } /* Maximum number of file descriptors, if we cannot get it via sysconf() */ @@ -3695,15 +3701,20 @@ tor_spawn_background(const char *const filename, const char **argv, child_state = CHILD_STATE_FAILEXEC; error: - /* XXX: are we leaking fds from the pipe? */ + { + /* XXX: are we leaking fds from the pipe? */ + int n; - format_helper_exit_status(child_state, errno, hex_errno); + n = format_helper_exit_status(child_state, errno, hex_errno); - /* Write the error message. GCC requires that we check the return - value, but there is nothing we can do if it fails */ - /* TODO: Don't use STDOUT, use a pipe set up just for this purpose */ - nbytes = write(STDOUT_FILENO, error_message, error_message_length); - nbytes = write(STDOUT_FILENO, hex_errno, sizeof(hex_errno)); + if (n >= 0) { + /* Write the error message. GCC requires that we check the return + value, but there is nothing we can do if it fails */ + /* TODO: Don't use STDOUT, use a pipe set up just for this purpose */ + nbytes = write(STDOUT_FILENO, error_message, error_message_length); + nbytes = write(STDOUT_FILENO, hex_errno, n); + } + } (void) nbytes; diff --git a/src/common/util.h b/src/common/util.h index 6b7c6fb..a2ab0cc 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -473,8 +473,8 @@ void tor_process_handle_destroy(process_handle_t *process_handle, int format_hex_number_for_helper_exit_status(unsigned int x, char *buf, int max_len); -void format_helper_exit_status(unsigned char child_state, - int saved_errno, char *hex_errno); +int format_helper_exit_status(unsigned char child_state, + int saved_errno, char *hex_errno); /* Space for hex values of child state, a slash, saved_errno (with leading minus) and newline (no null) */ diff --git a/src/test/test_util.c b/src/test/test_util.c index d71d280..fab9595 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2138,28 +2138,34 @@ test_util_exit_status(void *ptr) { /* Leave an extra byte for a \0 so we can do string comparison */ char hex_errno[HEX_ERRNO_SIZE + 1]; + int n; (void)ptr; clear_hex_errno(hex_errno); - format_helper_exit_status(0, 0, hex_errno); + n = format_helper_exit_status(0, 0, hex_errno); test_streq("0/0\n", hex_errno); + test_eq(n, strlen(hex_errno)); clear_hex_errno(hex_errno); - format_helper_exit_status(0, 0x7FFFFFFF, hex_errno); + n = format_helper_exit_status(0, 0x7FFFFFFF, hex_errno); test_streq("0/7FFFFFFF\n", hex_errno); + test_eq(n, strlen(hex_errno)); clear_hex_errno(hex_errno); - format_helper_exit_status(0xFF, -0x80000000, hex_errno); + n = format_helper_exit_status(0xFF, -0x80000000, hex_errno); test_streq("FF/-80000000\n", hex_errno); + test_eq(n, strlen(hex_errno)); clear_hex_errno(hex_errno); - format_helper_exit_status(0x7F, 0, hex_errno); + n = format_helper_exit_status(0x7F, 0, hex_errno); test_streq("7F/0\n", hex_errno); + test_eq(n, strlen(hex_errno)); clear_hex_errno(hex_errno); - format_helper_exit_status(0x08, -0x242, hex_errno); + n = format_helper_exit_status(0x08, -0x242, hex_errno); test_streq("8/-242\n", hex_errno); + test_eq(n, strlen(hex_errno)); done: ;

1 0

[tor/release-0.2.3] fix broken utf8-ism
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit ce44346aa5b4dddf37aff992755ef472d0d1f5a2 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jun 23 15:42:18 2012 -0400 fix broken utf8-ism --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90d6084..e2e9f45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -287,7 +287,7 @@ Changes in version 0.2.3.16-alpha - 2012-06-05 0.2.2.11-alpha. - Correctly handle checking the permissions on the parent directory of a control socket in the root directory. Bug found - by Esteban Manchado VelÃ¡zquez. Fixes bug 5089; bugfix on Tor + by Esteban Manchado Velázquez. Fixes bug 5089; bugfix on Tor 0.2.2.26-beta. - When told to add a bridge with the same digest as a preexisting bridge but a different addr:port, change the addr:port as

1 0

[tor/release-0.2.3] Don't assert in get_string_from_pipe() on len==0
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit ffd7189b3fc015ce47e6ab27ac85d4eab2183a2b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:35:43 2012 -0400 Don't assert in get_string_from_pipe() on len==0 We can treat this case as an EAGAIN (probably because of an unexpected internal NUL) rather than a crash-worthy problem. Fixes bug 6225, again. Bug not in any released version of Tor. --- src/common/util.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 8cb013e..e5b51b9 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4386,7 +4386,10 @@ get_string_from_pipe(FILE *stream, char *buf_out, size_t count) } } else { len = strlen(buf_out); - tor_assert(len>0); + if (len == 0) { + /* this probably means we got a NUL at the start of the string. */ + return IO_STREAM_EAGAIN; + } if (buf_out[len - 1] == '\n') { /* Remove the trailing newline */

1 0

[tor/release-0.2.3] Catch a few more K&R violations with make check-spaces
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit a6688c574e569a2a018038414198ab440344ba95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:51:48 2012 -0400 Catch a few more K&R violations with make check-spaces We now catch bare {s that should be on the previous line with a do, while, if, or for, and elses that should share a line with their preceding }. That is, if (foo) { and if (foo) { ... } else are now detected. We should think about maybe making Tor uncrustify-clean some day, but configuring uncrustify is an exercise in bizarreness, and reformatting huge gobs of Tor is always painful. --- contrib/checkSpace.pl | 10 +++++++++- src/or/circuitbuild.c | 3 +-- src/or/main.c | 3 +-- src/or/nodelist.c | 3 +-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/contrib/checkSpace.pl b/contrib/checkSpace.pl index a18df99..682dbce 100755 --- a/contrib/checkSpace.pl +++ b/contrib/checkSpace.pl @@ -32,10 +32,18 @@ for $fn (@ARGV) { if ($C && /\s(?:if|while|for|switch)\(/) { print " KW(:$fn:$.\n"; } - ## Warn about #else #if instead of #elif. + ## Warn about #else #if instead of #elif. if (($lastline =~ /^\# *else/) and ($_ =~ /^\# *if/)) { print " #else#if:$fn:$.\n"; } + ## Warn about some K&R violations + if (/^\s+\{/ and $lastline =~ /^\s*(if|while|for|else if)/ and + $lastline !~ /\{$/) { + print "non-K&R {:$fn:$.\n"; + } + if (/^\s*else/ and $lastline =~ /\}$/) { + print " }\\nelse:$fn:$.\n"; + } $lastline = $_; ## Warn about unnecessary empty lines. if ($lastnil && /^\s*}\n/) { diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index cfd1956..074b78d 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -5602,8 +5602,7 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node) /* XXXipv6 we lack support for falling back to another address for the same relay, warn the user */ - if (!tor_addr_is_null(&ri->ipv6_addr)) - { + if (!tor_addr_is_null(&ri->ipv6_addr)) { tor_addr_port_t ap; router_get_pref_orport(ri, &ap); log_notice(LD_CONFIG, diff --git a/src/or/main.c b/src/or/main.c index 1f3117b..95ac8d6 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2597,8 +2597,7 @@ tor_main(int argc, char *argv[]) // a file on a folder shared by the wm emulator. // if no flashcard (real or emulated) is present, // log files will be written in the root folder - if (find_flashcard_path(path,MAX_PATH) == -1) - { + if (find_flashcard_path(path,MAX_PATH) == -1) { redir = _wfreopen( L"\\stdout.log", L"w", stdout ); redirdbg = _wfreopen( L"\\stderr.log", L"w", stderr ); } else { diff --git a/src/or/nodelist.c b/src/or/nodelist.c index f7f3024..d178508 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -689,8 +689,7 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { router_get_prim_orport(node->ri, ap_out); - } - else if (node->rs) { + } else if (node->rs) { tor_addr_from_ipv4h(&ap_out->addr, node->rs->addr); ap_out->port = node->rs->or_port; }

1 0

[tor/release-0.2.3] Merge remote-tracking branch 'public/bug6225' into maint-0.2.3
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 2703e072a1056edd3b68a16e045175e5bd268301 Merge: a6688c5 ffd7189 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 25 11:51:19 2012 -0400 Merge remote-tracking branch 'public/bug6225' into maint-0.2.3 src/common/util.c | 34 ++++++++++++++++++++++++---------- src/common/util.h | 4 ++-- src/test/test_util.c | 16 +++++++++++----- 3 files changed, 37 insertions(+), 17 deletions(-)

1 0

[tor/release-0.2.3] Don't do DNS lookups when parsing corrupted managed proxy messages.
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 53e4452f985cad0947cd8ebfa0a1c198b6a7da7d Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jun 25 18:30:15 2012 +0300 Don't do DNS lookups when parsing corrupted managed proxy messages. The functions parse_{s,c}method_line() were using tor_addr_port_lookup() which is capable of doing DNS lookups. DNS lookups should not be necessary when parsing {C,S}METHOD lines. --- changes/bug6226 | 3 +++ src/or/transports.c | 30 ++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/changes/bug6226 b/changes/bug6226 new file mode 100644 index 0000000..7cbee10 --- /dev/null +++ b/changes/bug6226 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Don't do DNS lookups when parsing corrupted managed proxy + protocol messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha. diff --git a/src/or/transports.c b/src/or/transports.c index e43ec6c..4ba2395 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -790,7 +790,8 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) char *method_name=NULL; char *addrport=NULL; - tor_addr_t addr; + tor_addr_t tor_addr; + char *address=NULL; uint16_t port = 0; transport_t *transport=NULL; @@ -814,7 +815,7 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) } addrport = smartlist_get(items, 2); - if (tor_addr_port_lookup(addrport, &addr, &port)<0) { + if (tor_addr_port_split(LOG_PROTOCOL_WARN, addrport, &address, &port)<0) { log_warn(LD_CONFIG, "Error parsing transport " "address '%s'", addrport); goto err; @@ -826,7 +827,12 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) goto err; } - transport = transport_new(&addr, port, method_name, PROXY_NONE); + if (tor_addr_parse(&tor_addr, address) < 0) { + log_warn(LD_CONFIG, "Error parsing transport address '%s'", address); + goto err; + } + + transport = transport_new(&tor_addr, port, method_name, PROXY_NONE); if (!transport) goto err; @@ -835,7 +841,7 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) /* For now, notify the user so that he knows where the server transport is listening. */ log_info(LD_CONFIG, "Server transport %s at %s:%d.", - method_name, fmt_addr(&addr), (int)port); + method_name, address, (int)port); r=0; goto done; @@ -846,6 +852,7 @@ parse_smethod_line(const char *line, managed_proxy_t *mp) done: SMARTLIST_FOREACH(items, char*, s, tor_free(s)); smartlist_free(items); + tor_free(address); return r; } @@ -863,7 +870,8 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) int socks_ver=PROXY_NONE; char *addrport=NULL; - tor_addr_t addr; + tor_addr_t tor_addr; + char *address=NULL; uint16_t port = 0; transport_t *transport=NULL; @@ -899,7 +907,7 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) } addrport = smartlist_get(items, 3); - if (tor_addr_port_lookup(addrport, &addr, &port)<0) { + if (tor_addr_port_split(LOG_PROTOCOL_WARN, addrport, &address, &port)<0) { log_warn(LD_CONFIG, "Error parsing transport " "address '%s'", addrport); goto err; @@ -911,7 +919,12 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) goto err; } - transport = transport_new(&addr, port, method_name, socks_ver); + if (tor_addr_parse(&tor_addr, address) < 0) { + log_warn(LD_CONFIG, "Error parsing transport address '%s'", address); + goto err; + } + + transport = transport_new(&tor_addr, port, method_name, socks_ver); if (!transport) goto err; @@ -919,7 +932,7 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) log_info(LD_CONFIG, "Transport %s at %s:%d with SOCKS %d. " "Attached to managed proxy.", - method_name, fmt_addr(&addr), (int)port, socks_ver); + method_name, address, (int)port, socks_ver); r=0; goto done; @@ -930,6 +943,7 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) done: SMARTLIST_FOREACH(items, char*, s, tor_free(s)); smartlist_free(items); + tor_free(address); return r; }

1 0

[tor/release-0.2.3] Fix a compilation warning with clang 3.0
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 201b852c277bdf4bf70a656871d502318bd5b25b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 10:48:31 2012 -0400 Fix a compilation warning with clang 3.0 In b1ad1a1d0266a20bb we introduced an implicit (but safe) long-to-int shortening that clang didn't like. Warning not in any released version of Tor. --- src/common/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index e5b51b9..d94dcf2 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3347,7 +3347,7 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, *cur++ = '\n'; *cur++ = '\0'; - res = cur - hex_errno - 1; + res = (int)(cur - hex_errno - 1); goto done;

1 0

[tor/release-0.2.3] Bump the test util/threads timeout up to 150 sec
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit 4645f28c3b125f9d281eb457d110c431a6a0b166 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 25 13:44:34 2012 -0400 Bump the test util/threads timeout up to 150 sec This should make some debian build systems happier. Also, increase the select() timeout to a more reasonable 100 msec. --- changes/bug6227 | 3 +++ src/test/test_util.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug6227 b/changes/bug6227 new file mode 100644 index 0000000..77b06ac --- /dev/null +++ b/changes/bug6227 @@ -0,0 +1,3 @@ + o Minor bugfixes (unit tests): + - Avoid a false positive in the util/threads unit test by increasing + the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha. diff --git a/src/test/test_util.c b/src/test/test_util.c index fab9595..9b9fccf 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1186,7 +1186,7 @@ test_util_threads(void) #ifndef _WIN32 struct timeval tv; tv.tv_sec=0; - tv.tv_usec=10; + tv.tv_usec=100*1000; #endif #ifndef TOR_IS_MULTITHREADED /* Skip this test if we aren't threading. We should be threading most @@ -1213,7 +1213,7 @@ test_util_threads(void) if (strmap_get(_thread_test_strmap, "thread 1") && strmap_get(_thread_test_strmap, "thread 2")) { done = 1; - } else if (time(NULL) > started + 25) { + } else if (time(NULL) > started + 150) { timedout = done = 1; } tor_mutex_release(_thread_test_mutex);

1 0

[tor/release-0.2.3] Downgrade message about md cache cleaning from notice to info
by nickm＠torproject.org 28 Jun '12

28 Jun '12

commit c4586f4df7b7b403867baab03508ccc2f078a0ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 10:30:11 2012 -0400 Downgrade message about md cache cleaning from notice to info Fix for #6238 --- changes/bug6238 | 3 +++ src/or/microdesc.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug6238 b/changes/bug6238 new file mode 100644 index 0000000..67cfd1d --- /dev/null +++ b/changes/bug6238 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Downgrade a message about cleaning the microdescriptor cache to + "info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha. diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 42e8605..9395a9a 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -373,8 +373,8 @@ microdesc_cache_clean(microdesc_cache_t *cache, time_t cutoff, int force) } if (dropped) { - log_notice(LD_DIR, "Removed %d/%d microdescriptors as old.", - dropped,dropped+kept); + log_info(LD_DIR, "Removed %d/%d microdescriptors as old.", + dropped,dropped+kept); cache->bytes_dropped += bytes_dropped; } }

1 0