November 2017 - tor-commits - lists.torproject.org

[tor/master] Fix a traceback when closing a blocked connection "immediately".
by nickm＠torproject.org 17 Nov '17

17 Nov '17

commit 95238eb9174f0cfee9d313ce15b4f9b471f3d0e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 16 11:45:15 2017 -0500 Fix a traceback when closing a blocked connection "immediately". When we close a connection via connection_close_immediately, we kill its events immediately. But if it had been blocked on bandwidth read/write, we could try to re-add its (nonexistent) events later from connection_bucket_refill -- if we got to that callback before we swept the marked connections. Fixes bug 24167. Fortunately, this hasn't been a crash bug since we introduced connection_check_event in 0.2.9.10, and backported it. This is a bugfix on commit 89d422914a0c3cb, I believe, which appeared in Tor 0.1.0.1-rc. --- changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug24167 b/changes/bug24167 new file mode 100644 index 000000000..fd0d87eff --- /dev/null +++ b/changes/bug24167 @@ -0,0 +1,7 @@ + o Minor bugfixes (network layer): + - When closing a connection via close_connection_immediately(), we + mark it as "not blocked on bandwidth", to prevent later calls + from trying to unblock it, and give it permission to read. This + fixes a backtrace warning that can happen on relays under various + circumstances. Fixes bug 24167; bugfix on 0.1.0.1-rc. + diff --git a/src/or/connection.c b/src/or/connection.c index 276dca281..61f4f5aa6 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -721,6 +721,10 @@ connection_close_immediate(connection_t *conn) connection_unregister_events(conn); + /* Prevent the event from getting unblocked. */ + conn->read_blocked_on_bw = + conn->write_blocked_on_bw = 0; + if (SOCKET_OK(conn->s)) tor_close_socket(conn->s); conn->s = TOR_INVALID_SOCKET;

1 0

[tor/maint-0.3.2] Merge branch 'bug24167_025' into maint-0.3.2
by nickm＠torproject.org 17 Nov '17

17 Nov '17

commit 3a364309ace5bc0b75b724484d6b27d84ec6a8b1 Merge: 057101581 95238eb91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 17 08:35:52 2017 -0500 Merge branch 'bug24167_025' into maint-0.3.2 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0

[tor/master] Merge branch 'bug24167_025' into maint-0.3.2
by nickm＠torproject.org 17 Nov '17

17 Nov '17

commit 3a364309ace5bc0b75b724484d6b27d84ec6a8b1 Merge: 057101581 95238eb91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 17 08:35:52 2017 -0500 Merge branch 'bug24167_025' into maint-0.3.2 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 17 Nov '17

17 Nov '17

commit 368dc1003eeb58ad11e1eb13904ef7f79ef019d1 Merge: 4ef70ff38 3a364309a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 17 08:35:56 2017 -0500 Merge branch 'maint-0.3.2' changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.3.2] Fix a traceback when closing a blocked connection "immediately".
by nickm＠torproject.org 17 Nov '17

17 Nov '17

commit 95238eb9174f0cfee9d313ce15b4f9b471f3d0e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 16 11:45:15 2017 -0500 Fix a traceback when closing a blocked connection "immediately". When we close a connection via connection_close_immediately, we kill its events immediately. But if it had been blocked on bandwidth read/write, we could try to re-add its (nonexistent) events later from connection_bucket_refill -- if we got to that callback before we swept the marked connections. Fixes bug 24167. Fortunately, this hasn't been a crash bug since we introduced connection_check_event in 0.2.9.10, and backported it. This is a bugfix on commit 89d422914a0c3cb, I believe, which appeared in Tor 0.1.0.1-rc. --- changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug24167 b/changes/bug24167 new file mode 100644 index 000000000..fd0d87eff --- /dev/null +++ b/changes/bug24167 @@ -0,0 +1,7 @@ + o Minor bugfixes (network layer): + - When closing a connection via close_connection_immediately(), we + mark it as "not blocked on bandwidth", to prevent later calls + from trying to unblock it, and give it permission to read. This + fixes a backtrace warning that can happen on relays under various + circumstances. Fixes bug 24167; bugfix on 0.1.0.1-rc. + diff --git a/src/or/connection.c b/src/or/connection.c index 276dca281..61f4f5aa6 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -721,6 +721,10 @@ connection_close_immediate(connection_t *conn) connection_unregister_events(conn); + /* Prevent the event from getting unblocked. */ + conn->read_blocked_on_bw = + conn->write_blocked_on_bw = 0; + if (SOCKET_OK(conn->s)) tor_close_socket(conn->s); conn->s = TOR_INVALID_SOCKET;

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 17 Nov '17

17 Nov '17

commit 00aeecb397a65b3687a01fbe7b33773ccbbac158 Merge: b9826ba45 3a364309a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 17 08:35:56 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0

[tor/maint-0.3.2] Downgrade evdns warnings about weird replies.
by nickm＠torproject.org 17 Nov '17

17 Nov '17

commit 2a98fcb84859a8dfadf1c3430b901f0d8e6b3f06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 16 09:30:19 2017 -0500 Downgrade evdns warnings about weird replies. evdns is allowed to give us unrecognized object types; it is allowed to give us non-IPv4 answer types, and it is (even) allowed to give us empty answers without an error. Closes ticket 24097. --- changes/ticket24097 | 4 ++++ src/or/dns.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/ticket24097 b/changes/ticket24097 new file mode 100644 index 000000000..36547a8dd --- /dev/null +++ b/changes/ticket24097 @@ -0,0 +1,4 @@ + o Minor features (logging): + - Downgrade a pair of log messages that could occur when an exit's + resolver gave us an unusual (but not forbidden) response. + Closes ticket 24097. diff --git a/src/or/dns.c b/src/or/dns.c index 4194a29a6..7dc3575f5 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1578,10 +1578,11 @@ evdns_callback(int result, char type, int count, int ttl, void *addresses, escaped_safe_str(hostname)); tor_free(escaped_address); } else if (count) { - log_warn(LD_EXIT, "eventdns returned only non-IPv4 answers for %s.", + log_info(LD_EXIT, "eventdns returned only unrecognized answer types " + " for %s.", escaped_safe_str(string_address)); } else { - log_warn(LD_BUG, "eventdns returned no addresses or error for %s!", + log_info(LD_EXIT, "eventdns returned no addresses or error for %s.", escaped_safe_str(string_address)); } }

1 0

[tor/release-0.3.2] Merge branch 'ticket24097_032' into maint-0.3.2
by nickm＠torproject.org 17 Nov '17

17 Nov '17

commit 0571015819317f6b52416d8023a99ee5a8f31dee Merge: 0684e6c6f 2a98fcb84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 17 08:35:01 2017 -0500 Merge branch 'ticket24097_032' into maint-0.3.2 changes/ticket24097 | 4 ++++ src/or/dns.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.2] Downgrade evdns warnings about weird replies.
by nickm＠torproject.org 17 Nov '17

17 Nov '17

commit 2a98fcb84859a8dfadf1c3430b901f0d8e6b3f06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 16 09:30:19 2017 -0500 Downgrade evdns warnings about weird replies. evdns is allowed to give us unrecognized object types; it is allowed to give us non-IPv4 answer types, and it is (even) allowed to give us empty answers without an error. Closes ticket 24097. --- changes/ticket24097 | 4 ++++ src/or/dns.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/ticket24097 b/changes/ticket24097 new file mode 100644 index 000000000..36547a8dd --- /dev/null +++ b/changes/ticket24097 @@ -0,0 +1,4 @@ + o Minor features (logging): + - Downgrade a pair of log messages that could occur when an exit's + resolver gave us an unusual (but not forbidden) response. + Closes ticket 24097. diff --git a/src/or/dns.c b/src/or/dns.c index 4194a29a6..7dc3575f5 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1578,10 +1578,11 @@ evdns_callback(int result, char type, int count, int ttl, void *addresses, escaped_safe_str(hostname)); tor_free(escaped_address); } else if (count) { - log_warn(LD_EXIT, "eventdns returned only non-IPv4 answers for %s.", + log_info(LD_EXIT, "eventdns returned only unrecognized answer types " + " for %s.", escaped_safe_str(string_address)); } else { - log_warn(LD_BUG, "eventdns returned no addresses or error for %s!", + log_info(LD_EXIT, "eventdns returned no addresses or error for %s.", escaped_safe_str(string_address)); } }

1 0

[tor/master] Merge branch 'ticket24097_032' into maint-0.3.2
by nickm＠torproject.org 17 Nov '17

17 Nov '17

commit 0571015819317f6b52416d8023a99ee5a8f31dee Merge: 0684e6c6f 2a98fcb84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 17 08:35:01 2017 -0500 Merge branch 'ticket24097_032' into maint-0.3.2 changes/ticket24097 | 4 ++++ src/or/dns.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0