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

[tor/master] Remove an extraneous space in a log message
by nickm＠torproject.org 11 Mar '16

11 Mar '16

commit 10330c12346af2b0fff892626295db30b98e6115 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Mar 1 19:08:02 2016 +0100 Remove an extraneous space in a log message --- src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/router.c b/src/or/router.c index 60b03c0..68bcf13 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1953,7 +1953,7 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) log_warn(LD_CONFIG, "Unable to use configured IPv6 address \"%s\" in a " "descriptor. Skipping it. " - "Try specifying a globally reachable address explicitly. ", + "Try specifying a globally reachable address explicitly.", tor_addr_to_str(addrbuf, &p->addr, sizeof(addrbuf), 1)); } }

1 0

[tor/master] Merge remote-tracking branch 'teor/bug17153'
by nickm＠torproject.org 11 Mar '16

11 Mar '16

commit a86f78a9f258589b5a0a4323c8e5eb1280dd4c95 Merge: fe0d346 10330c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 11:23:58 2016 -0500 Merge remote-tracking branch 'teor/bug17153' changes/bug17153 | 4 ++++ src/or/router.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/master] Don't allow a rendezvous point to have a private address
by nickm＠torproject.org 11 Mar '16

11 Mar '16

commit 4a7964b3bcfa5439ba10e227c2ca8a4564123538 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue Dec 8 13:42:27 2015 -0500 Don't allow a rendezvous point to have a private address When an HS process an INTRODUCE2 cell, we didn't validate if the IP address of the rendezvous point was a local address. If it's the case, we end up wasting resources by trying to extend to a local address which fails since we do not allow that in circuit_extend(). This commit now rejects a rendezvous point that has a local address once seen at the hidden service side unless ExtendAllowPrivateAddresses is set. Fixes #8976 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/circuitbuild.c | 15 +++++++++++++++ src/or/circuitbuild.h | 1 + src/or/rendservice.c | 12 ++++++++++++ 3 files changed, 28 insertions(+) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 0688398..6a3c164 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2403,3 +2403,18 @@ build_state_get_exit_nickname(cpath_build_state_t *state) return state->chosen_exit->nickname; } +/** Return true iff the given address can be used to extend to. */ +int extend_info_addr_is_allowed(const tor_addr_t *addr) +{ + tor_assert(addr); + + /* Check if we have a private address and if we can extend to it. */ + if (tor_addr_is_internal(addr, 0) && + !get_options()->ExtendAllowPrivateAddresses) { + goto disallow; + } + /* Allowed! */ + return 1; + disallow: + return 0; +} diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index 0156379..5d6222e 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -53,6 +53,7 @@ extend_info_t *extend_info_new(const char *nickname, const char *digest, extend_info_t *extend_info_from_node(const node_t *r, int for_direct_connect); extend_info_t *extend_info_dup(extend_info_t *info); void extend_info_free(extend_info_t *info); +int extend_info_addr_is_allowed(const tor_addr_t *addr); const node_t *build_state_get_exit_node(cpath_build_state_t *state); const char *build_state_get_exit_nickname(cpath_build_state_t *state); diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 15d98bf..aad47bb 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1818,6 +1818,18 @@ find_rp_for_intro(const rend_intro_cell_t *intro, goto err; } + /* Make sure the RP we are being asked to connect to is _not_ a private + * address unless it's allowed. Let's avoid to build a circuit to our + * second middle node and fail right after when extending to the RP. */ + if (!extend_info_addr_is_allowed(&rp->addr)) { + if (err_msg_out) { + tor_asprintf(&err_msg, + "Relay IP in INTRODUCE2 cell is private address."); + } + extend_info_free(rp); + rp = NULL; + goto err; + } goto done; err:

1 0

[tor/master] Reject multicast rendezvous point addresses
by nickm＠torproject.org 11 Mar '16

11 Mar '16

commit b0ca80c23fede62feefb7ad5e5c8bdf7a732c4c4 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Feb 2 13:32:54 2016 +1100 Reject multicast rendezvous point addresses Unless ExtendAllowPrivateAddresses is 1. --- src/or/circuitbuild.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6a3c164..2e91f94 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2409,7 +2409,7 @@ int extend_info_addr_is_allowed(const tor_addr_t *addr) tor_assert(addr); /* Check if we have a private address and if we can extend to it. */ - if (tor_addr_is_internal(addr, 0) && + if ((tor_addr_is_internal(addr, 0) || tor_addr_is_multicast(addr)) && !get_options()->ExtendAllowPrivateAddresses) { goto disallow; }

1 0

[tor/master] Add a changes file for bug 8976
by nickm＠torproject.org 11 Mar '16

11 Mar '16

commit 7275dd4fd17a2b5e7465cf6f96d6db834a15c869 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Mar 4 18:31:07 2016 +0100 Add a changes file for bug 8976 --- changes/bug8976 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug8976 b/changes/bug8976 new file mode 100644 index 0000000..ff1c1a7 --- /dev/null +++ b/changes/bug8976 @@ -0,0 +1,5 @@ + o Minor bugfixes (security, hidden services): + - Prevent hidden services connecting to client-supplied rendezvous + addresses that are reserved as internal or multicast. + Fixes bug 8976; bugfix on b7c172c9e in tor-0.2.3.21. + Patch by "dgoulet" and "teor".

1 0

[tor/master] Merge remote-tracking branch 'teor/bug8976_01_028'
by nickm＠torproject.org 11 Mar '16

11 Mar '16

commit fe0d346a6df3d20f81a90c4cfe4de89046907961 Merge: 656e231 7275dd4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 11:11:38 2016 -0500 Merge remote-tracking branch 'teor/bug8976_01_028' changes/bug8976 | 5 +++++ src/or/circuitbuild.c | 15 +++++++++++++++ src/or/circuitbuild.h | 1 + src/or/rendservice.c | 12 ++++++++++++ 4 files changed, 33 insertions(+)

1 0

[tor/master] Avoid freeing an uninitialised pointer in get_interface_addresses_ioctl
by nickm＠torproject.org 11 Mar '16

11 Mar '16

commit 2627299ef053ed40a73cb40e954e6b611d7e450b Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Mar 4 18:41:49 2016 +0100 Avoid freeing an uninitialised pointer in get_interface_addresses_ioctl --- changes/bug18454 | 8 ++++++++ src/common/address.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug18454 b/changes/bug18454 new file mode 100644 index 0000000..c573dae --- /dev/null +++ b/changes/bug18454 @@ -0,0 +1,8 @@ + o Minor bugfixes (memory safety): + - Avoid freeing an uninitialised pointer when opening a socket fails + in get_interface_addresses_ioctl. + Fixes bug 18454; bugfix on 9f06ec0c in tor-0.2.3.11-alpha. + Reported by "toralf" and "cypherpunks", patch by "teor". + - Correctly duplicate addresses in get_interface_address6_list. + Fixes bug 18454; bugfix on 110765f5 in tor-0.2.8.1-alpha. + Reported by "toralf", patch by "cypherpunks". diff --git a/src/common/address.c b/src/common/address.c index 8f1ce9d..c77b0f3 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1525,6 +1525,7 @@ get_interface_addresses_ioctl(int severity, sa_family_t family) { /* Some older unixy systems make us use ioctl(SIOCGIFCONF) */ struct ifconf ifc; + ifc.ifc_buf = NULL; int fd; smartlist_t *result = NULL; @@ -1547,7 +1548,6 @@ get_interface_addresses_ioctl(int severity, sa_family_t family) } int mult = 1; - ifc.ifc_buf = NULL; do { mult *= 2; ifc.ifc_len = mult * IFREQ_SIZE;

1 0

[tor/master] Correctly duplicate addresses in get_interface_address6_list
by nickm＠torproject.org 11 Mar '16

11 Mar '16

commit 9f98e6535ac58afa0cc56a4a5d9164fedead4b3c Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Mar 4 18:42:27 2016 +0100 Correctly duplicate addresses in get_interface_address6_list --- src/common/address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index c77b0f3..793a40e 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1790,7 +1790,7 @@ MOCK_IMPL(smartlist_t *,get_interface_address6_list,(int severity, if (get_interface_address6_via_udp_socket_hack(severity,AF_INET, &addr) == 0) { if (include_internal || !tor_addr_is_internal(&addr, 0)) { - smartlist_add(addrs, tor_dup_addr(&addr)); + smartlist_add(addrs, tor_memdup(&addr, sizeof(addr))); } } } @@ -1799,7 +1799,7 @@ MOCK_IMPL(smartlist_t *,get_interface_address6_list,(int severity, if (get_interface_address6_via_udp_socket_hack(severity,AF_INET6, &addr) == 0) { if (include_internal || !tor_addr_is_internal(&addr, 0)) { - smartlist_add(addrs, tor_dup_addr(&addr)); + smartlist_add(addrs, tor_memdup(&addr, sizeof(addr))); } } }

1 0

[tor/master] Merge remote-tracking branch 'teor/bug18454'
by nickm＠torproject.org 11 Mar '16

11 Mar '16

commit 656e23171d64885c1bea95403768386ee369e949 Merge: 36ac47b 9f98e65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 10:22:41 2016 -0500 Merge remote-tracking branch 'teor/bug18454' changes/bug18454 | 8 ++++++++ src/common/address.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/master] Treat bt_test.py failures as "SKIP" on freebsd.
by nickm＠torproject.org 11 Mar '16

11 Mar '16

commit b860f82d565191a6d21bde0b6940fc1871e4d935 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 1 14:11:45 2016 -0500 Treat bt_test.py failures as "SKIP" on freebsd. Closes #18204. --- changes/bug18204_028 | 3 +++ src/test/bt_test.py | 8 ++++++++ src/test/test_bt.sh | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/changes/bug18204_028 b/changes/bug18204_028 new file mode 100644 index 0000000..3a1a116 --- /dev/null +++ b/changes/bug18204_028 @@ -0,0 +1,3 @@ + o Testing: + - Treat backtrace test failures as expected on FreeBSD until we + solve bug 17808. Closes ticket 18204. diff --git a/src/test/bt_test.py b/src/test/bt_test.py index dab02d7..3059145 100755 --- a/src/test/bt_test.py +++ b/src/test/bt_test.py @@ -39,7 +39,15 @@ for I in range(len(LINES)): print("OK") sys.exit(0) +print("BAD") + for l in LINES: print("{}".format(l), end="") +if sys.platform.startswith('freebsd'): + # See bug #17808 if you know how to fix this. + print("Test failed; but FreeBSD is known to have backtrace problems.\n" + "Treating as 'SKIP'.") + sys.exit(77) + sys.exit(1) diff --git a/src/test/test_bt.sh b/src/test/test_bt.sh index f55f451..033acac 100755 --- a/src/test/test_bt.sh +++ b/src/test/test_bt.sh @@ -3,8 +3,8 @@ exitcode=0 -"${builddir:-.}/src/test/test-bt-cl" backtraces || exit 77 -"${builddir:-.}/src/test/test-bt-cl" assert | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode=1 -"${builddir:-.}/src/test/test-bt-cl" crash | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode=1 +"${builddir:-.}/src/test/test-bt-cl" backtraces || exit $? +"${builddir:-.}/src/test/test-bt-cl" assert | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode="$?" +"${builddir:-.}/src/test/test-bt-cl" crash | "${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/bt_test.py" || exitcode="$?" exit ${exitcode}

1 0