- tor-commits - lists.torproject.org

[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

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

11 Mar '16

commit 36ac47bd85b1c2c7077b7b008362f6b8da42e237 Merge: 25fa218 b860f82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 10:10:15 2016 -0500 Merge remote-tracking branch 'public/bug18204_028' changes/bug18204_028 | 3 +++ src/test/bt_test.py | 8 ++++++++ src/test/test_bt.sh | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-)

1 0

[tor/master] Move Automake options to configure.ac
by nickm＠torproject.org 11 Mar '16

11 Mar '16

commit 25fa21802f578db0e2852084a95a23b60ef1d1e9 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Feb 26 12:53:28 2016 +0000 Move Automake options to configure.ac This will centralize the version configuration in one file to simplify future changes. Also fixes some typos in the Automake options comments. --- Makefile.am | 5 ----- configure.ac | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index bae506a..92ba2b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,11 +3,6 @@ # Copyright (c) 2007-2015, The Tor Project, Inc. # See LICENSE for licensing information -# "foreign" means we don't follow GNU package layout standards -# 1.11 means we require automake vesion 1.11 -# "subdir-objects" means put .o files in the same directory as the .c files -AUTOMAKE_OPTIONS = foreign 1.11 subdir-objects - ACLOCAL_AMFLAGS = -I m4 noinst_LIBRARIES= diff --git a/configure.ac b/configure.ac index a4581e5..df4b9cd 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,12 @@ AC_PREREQ([2.63]) AC_INIT([tor],[0.2.8.1-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE + +# "foreign" means we don't follow GNU package layout standards +# "1.11" means we require automake version 1.11 or newer +# "subdir-objects" means put .o files in the same directory as the .c files +AM_INIT_AUTOMAKE([foreign 1.11 subdir-objects]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS([orconfig.h])

1 0

[tor/master] enable and test transproxy on FreeBSD derivatives #18448
by nickm＠torproject.org 11 Mar '16

11 Mar '16

commit db263442af565fde0d54398da7cc80a66469d273 Author: Steven Chamberlain <steven(a)pyro.eu.org> Date: Mon Feb 29 14:15:20 2016 +0000 enable and test transproxy on FreeBSD derivatives #18448 The transproxy feature is only enabled when __FreeBSD__ is defined, and only regular FreeBSD does that. Change this to __FreeBSD_kernel__ which is defined on derivatives as well. This enables the relevant options/validate__transproxy test on FreeBSD derivatives. --- src/or/config.c | 2 +- src/test/test_options.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 544b032..ad4138a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2861,7 +2861,7 @@ options_validate(or_options_t *old_options, or_options_t *options, options->TransProxyType_parsed = TPT_TPROXY; #endif } else if (!strcasecmp(options->TransProxyType, "ipfw")) { -#if !defined(__FreeBSD__) && !defined( DARWIN ) +#if !defined(__FreeBSD_kernel__) && !defined( DARWIN ) /* Earlier versions of OS X have ipfw */ REJECT("ipfw is a FreeBSD-specific" "and OS X/Darwin-specific feature."); diff --git a/src/test/test_options.c b/src/test/test_options.c index ff1eb18..9458ade 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1058,7 +1058,7 @@ test_options_validate__transproxy(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); -#if !defined(__FreeBSD__) && !defined( DARWIN ) +#if !defined(__FreeBSD_kernel__) && !defined( DARWIN ) tt_str_op(msg, OP_EQ, "ipfw is a FreeBSD-specificand OS X/Darwin-specific " "feature."); #else @@ -1086,7 +1086,7 @@ test_options_validate__transproxy(void *ignored) tt_int_op(ret, OP_EQ, -1); tt_assert(!msg); #endif -#if defined(__FreeBSD__) || defined( DARWIN ) +#if defined(__FreeBSD_kernel__) || defined( DARWIN ) tdata = get_options_test_data("TransProxyType ipfw\n" "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);

1 0

[tor/master] Add changes file for 18448; refactor
by nickm＠torproject.org 11 Mar '16

11 Mar '16

commit ef31c8862f4ed86cfa4987b2ec58468269457f87 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 10:05:28 2016 -0500 Add changes file for 18448; refactor (I've made it so FreeBSD || FreeBSD_kernel is enough to ensure that we think you might have ipfw, and so that the logic is all in one place.) --- changes/bug18448 | 6 ++++++ src/or/config.c | 2 +- src/or/config.h | 4 ++++ src/test/test_options.c | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/changes/bug18448 b/changes/bug18448 new file mode 100644 index 0000000..e328ce3 --- /dev/null +++ b/changes/bug18448 @@ -0,0 +1,6 @@ + o Minor features (build): + - Detect systems with FreeBSD-derived kernels (such as GNU/kFreeBSD) as + having possible IPfW support. Closes ticket 18448. Patch from + Steven Chamberlain. + + diff --git a/src/or/config.c b/src/or/config.c index ad4138a..4f4b9df 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2861,7 +2861,7 @@ options_validate(or_options_t *old_options, or_options_t *options, options->TransProxyType_parsed = TPT_TPROXY; #endif } else if (!strcasecmp(options->TransProxyType, "ipfw")) { -#if !defined(__FreeBSD_kernel__) && !defined( DARWIN ) +#ifndef KERNEL_MAY_SUPPORT_IPFW /* Earlier versions of OS X have ipfw */ REJECT("ipfw is a FreeBSD-specific" "and OS X/Darwin-specific feature."); diff --git a/src/or/config.h b/src/or/config.h index c301645..02121cf 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -14,6 +14,10 @@ #include "testsupport.h" +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(DARWIN) +#define KERNEL_MAY_SUPPORT_IPFW +#endif + MOCK_DECL(const char*, get_dirportfrontpage, (void)); MOCK_DECL(const or_options_t *, get_options, (void)); MOCK_DECL(or_options_t *, get_options_mutable, (void)); diff --git a/src/test/test_options.c b/src/test/test_options.c index 9458ade..d294e60 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1058,7 +1058,7 @@ test_options_validate__transproxy(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); -#if !defined(__FreeBSD_kernel__) && !defined( DARWIN ) +#ifndef KERNEL_MAY_SUPPORT_IPFW tt_str_op(msg, OP_EQ, "ipfw is a FreeBSD-specificand OS X/Darwin-specific " "feature."); #else

1 0