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

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

09 Mar '15

commit c5c4ea2db0411ac1e5f3abd6ca8fa4ae322ee906 Merge: 5ad47aa d5b2cbe Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 12:19:28 2015 +0100 Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.6 changes/bug15088 | 4 ++++ src/common/sandbox.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/release-0.2.6] Make the assert related to 15083 a tiny bit more tolerant
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 81a994ce77038721df3aa2f77b783db9a52da79e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 3 22:25:26 2015 +0100 Make the assert related to 15083 a tiny bit more tolerant --- changes/bug15083 | 6 +++++- src/or/buffers.c | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/bug15083 b/changes/bug15083 index 98d1d0e..2bd0715 100644 --- a/changes/bug15083 +++ b/changes/bug15083 @@ -3,4 +3,8 @@ failure if a buffer of exactly the wrong layout was passed to buf_pullup() at exactly the wrong time. Fixes bug 15083; bugfix on 0.2.0.10-alpha. Patch from 'cypherpunks'. - + + - Do not assert if the 'data' pointer on a buffer is advanced to the very + end of the buffer; log a BUG message instead. Only assert if it is + past that point. Fixes bug 15083; bugfix on 0.2.0.10-alpha. + diff --git a/src/or/buffers.c b/src/or/buffers.c index 7976432..9dfed00 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -2483,7 +2483,14 @@ assert_buf_ok(buf_t *buf) total += ch->datalen; tor_assert(ch->datalen <= ch->memlen); tor_assert(ch->data >= &ch->mem[0]); - tor_assert(ch->data < &ch->mem[0]+ch->memlen); + tor_assert(ch->data <= &ch->mem[0]+ch->memlen); + if (ch->data == &ch->mem[0]+ch->memlen) { + static int warned = 0; + if (! warned) { + log_warn(LD_BUG, "Invariant violation in buf.c related to #15083"); + warned = 1; + } + } tor_assert(ch->data+ch->datalen <= &ch->mem[0] + ch->memlen); if (!ch->next) tor_assert(ch == buf->tail);

1 0

[tor/release-0.2.6] Add wait4 to the seccomp2 sandbox allowable syscall list
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit d5b2cbea106e020436d577e42672d281400558dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 12:18:10 2015 +0100 Add wait4 to the seccomp2 sandbox allowable syscall list fixes bug 15088. patch from sanic. --- changes/bug15088 | 4 ++++ src/common/sandbox.c | 1 + 2 files changed, 5 insertions(+) diff --git a/changes/bug15088 b/changes/bug15088 new file mode 100644 index 0000000..95878bd --- /dev/null +++ b/changes/bug15088 @@ -0,0 +1,4 @@ + o Minor bugfixes (Linux seccomp2 sandbox): + - Upon receiving sighup, do not crash during attempts to call + wait4. Fixes bug 15088; bugfix on 0.2.5.1-alpha. Patch from + "sanic". diff --git a/src/common/sandbox.c b/src/common/sandbox.c index dbbaa59..e43b64b 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -164,6 +164,7 @@ static int filter_nopar_gen[] = { #endif SCMP_SYS(stat), SCMP_SYS(uname), + SCMP_SYS(wait4), SCMP_SYS(write), SCMP_SYS(writev), SCMP_SYS(exit_group),

1 0

[tor/release-0.2.6] only declare rv when it is used in destination_from_socket. Fixes 15151
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 2d926d0147af8c632fe389e770c5832009f2ddc0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 12:12:41 2015 +0100 only declare rv when it is used in destination_from_socket. Fixes 15151 --- changes/bug15151 | 3 +++ src/or/connection_edge.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug15151 b/changes/bug15151 new file mode 100644 index 0000000..b9c3061 --- /dev/null +++ b/changes/bug15151 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Fix a compilation warning on FreeBSD. Fixes bug 15151; bugfix on + 0.2.6.2-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 3c817de..e6dfc63 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1598,7 +1598,6 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req) struct sockaddr_storage orig_dst; socklen_t orig_dst_len = sizeof(orig_dst); tor_addr_t addr; - int rv; #ifdef TRANS_TRPOXY if (options->TransProxyType_parsed == TPT_TPROXY) { @@ -1613,6 +1612,7 @@ destination_from_socket(entry_connection_t *conn, socks_request_t *req) #endif #ifdef TRANS_NETFILTER + int rv = -1; switch (ENTRY_TO_CONN(conn)->socket_family) { #ifdef TRANS_NETFILTER_IPV4 case AF_INET:

1 0

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

09 Mar '15

commit 5ad47aafabfdb9718b4beb7c3893af58a9147e2e Merge: 2d926d0 930ab95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 12:14:17 2015 +0100 Merge remote-tracking branch 'public/bug15127_025' into maint-0.2.6 changes/bug15127 | 3 +++ src/common/include.am | 1 + src/or/include.am | 1 + 3 files changed, 5 insertions(+)

1 0

[tor/release-0.2.6] Make TransProxyType ipfw work correctly
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 681802817deb6fb93b95f8284856fd42f3556600 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 12:24:51 2015 +0100 Make TransProxyType ipfw work correctly Fixes bug 15064; bugfix on 0.2.5.4-alpha. --- changes/bug15064 | 4 ++++ src/or/connection_edge.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug15064 b/changes/bug15064 new file mode 100644 index 0000000..e6bd747 --- /dev/null +++ b/changes/bug15064 @@ -0,0 +1,4 @@ + o Major bugfixes (FreeBSD IPFW transparent proxy): + - Fix address detection with FreeBSD transparent proxies, + when "TransProxyType ipfw" is in use. + Fixes bug 15064; bugfix on 0.2.5.4-alpha. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 49f9ba4..1eeb22f 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1531,7 +1531,8 @@ connection_ap_get_original_destination(entry_connection_t *conn, if (options->TransProxyType_parsed == TPT_PF_DIVERT) return destination_from_socket(conn, req); - if (options->TransProxyType_parsed == TPT_DEFAULT) + if (options->TransProxyType_parsed == TPT_DEFAULT || + options->TransProxyType_parsed == TPT_IPFW) return destination_from_pf(conn, req); (void)conn;

1 0

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

09 Mar '15

commit a726cd76df0205d573ce0a641b65a89c5f1ce3b4 Merge: c5c4ea2 6818028 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 12:26:43 2015 +0100 Merge remote-tracking branch 'public/bug15064_025' into maint-0.2.6 changes/bug15064 | 4 ++++ src/or/connection_edge.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.6] Revert "Missing dependencies; fixes 15127."
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit de2c5ad8150a9c111dd8f1dcfed1ceea132578f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 15:18:33 2015 +0100 Revert "Missing dependencies; fixes 15127." This reverts commit 930ab95e1fb0dfd5af35e7d84ca58ff21b65a605. --- changes/bug15127 | 3 --- src/common/include.am | 1 - src/or/include.am | 1 - 3 files changed, 5 deletions(-) diff --git a/changes/bug15127 b/changes/bug15127 deleted file mode 100644 index 642dc02..0000000 --- a/changes/bug15127 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (compilation): - - Add missing dependencies to fix compilation on BSD. Patch from - Peter Palfrader. Fixes bug 15127; bugfix on 0.2.5.1-alpha. diff --git a/src/common/include.am b/src/common/include.am index a642f7a..5b63392 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -146,5 +146,4 @@ src/common/common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(COMMONHEA fi src/common/util_codedigest.o: src/common/common_sha1.i -src/common/src_common_libor_testing_a-util_codedigest.o: src/common/common_sha1.i diff --git a/src/or/include.am b/src/or/include.am index e257ceb..b44e109 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -190,7 +190,6 @@ ORHEADERS = \ noinst_HEADERS+= $(ORHEADERS) micro-revision.i src/or/config_codedigest.o: src/or/or_sha1.i -src/or/src_or_libtor_testing_a-config_codedigest.o: src/or/or_sha1.i micro-revision.i: FORCE @rm -f micro-revision.tmp; \

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 6704e18dd2e09111eeca0c76fb00a459f9da98ea Merge: 2bcb596 addffcc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 11:08:57 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug15083 | 10 ++++++++++ src/or/buffers.c | 11 +++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.6] Make boostrap events include hostname ANDaddr AND digest
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 98822df3dcdf7cd0456aee7898507dd3059f930b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 4 14:23:59 2015 +0100 Make boostrap events include hostname ANDaddr AND digest --- src/or/control.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index dc3e5fc..e25c3b2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -5049,7 +5049,6 @@ MOCK_IMPL(void, char buf[BOOTSTRAP_MSG_LEN]; const char *recommendation = "ignore"; int severity; - char host[128]; /* bootstrap_percent must not be in "undefined" state here. */ tor_assert(status >= 0); @@ -5079,8 +5078,6 @@ MOCK_IMPL(void, if (we_are_hibernating()) recommendation = "ignore"; - orconn_target_get_name(host, sizeof(host), or_conn); - while (status>=0 && bootstrap_status_to_string(status, &tag, &summary) < 0) status--; /* find a recognized status string based on current progress */ status = bootstrap_percent; /* set status back to the actual number */ @@ -5089,19 +5086,26 @@ MOCK_IMPL(void, log_fn(severity, LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " - "count %d; recommendation %s; host %s)", + "count %d; recommendation %s; host %s at %s:%d)", status, summary, warn, orconn_end_reason_to_control_string(reason), - bootstrap_problems, recommendation, host); + bootstrap_problems, recommendation, + hex_str(or_conn->identity_digest, DIGEST_LEN), + or_conn->base_.address, + or_conn->base_.port); connection_or_report_broken_states(severity, LD_HANDSHAKE); tor_snprintf(buf, sizeof(buf), "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\" WARNING=\"%s\" REASON=%s " - "COUNT=%d RECOMMENDATION=%s HOST=\"%s\"", + "COUNT=%d RECOMMENDATION=%s HOSTID=\"%s\" HOSTADDR=\"%s:%d\"", bootstrap_percent, tag, summary, warn, orconn_end_reason_to_control_string(reason), bootstrap_problems, - recommendation, host); + recommendation, + hex_str(or_conn->identity_digest, DIGEST_LEN), + or_conn->base_.address, + (int)or_conn->base_.port); + tor_snprintf(last_sent_bootstrap_message, sizeof(last_sent_bootstrap_message), "WARN %s", buf);

1 0