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

[tor/master] Turn base < 0 into a BUG() in our long-parse functions.
by nickm＠torproject.org 28 Jul '17

28 Jul '17

commit accb734c5fc45481231b837cae1244129144df06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 28 10:26:06 2017 -0400 Turn base < 0 into a BUG() in our long-parse functions. --- src/common/util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 5b4702809..0858d17fe 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1172,7 +1172,7 @@ tor_parse_long(const char *s, int base, long min, long max, char *endptr; long r; - if (base < 0) { + if (BUG(base < 0)) { if (ok) *ok = 0; return 0; @@ -1191,7 +1191,7 @@ tor_parse_ulong(const char *s, int base, unsigned long min, char *endptr; unsigned long r; - if (base < 0) { + if (BUG(base < 0)) { if (ok) *ok = 0; return 0; @@ -1223,7 +1223,7 @@ tor_parse_uint64(const char *s, int base, uint64_t min, char *endptr; uint64_t r; - if (base < 0) { + if (BUG(base < 0)) { if (ok) *ok = 0; return 0;

1 0

[tor/master] Add an assertion to try to please coverity.
by nickm＠torproject.org 28 Jul '17

28 Jul '17

commit decb9276852b4cb7f9f2472c81cd47fbab60845f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 28 10:17:14 2017 -0400 Add an assertion to try to please coverity. Coverity, for some reason, thought that weight_scale might be 0, leading to a divide-by-zero error. --- src/or/routerparse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index f4e87a00d..8823c0b53 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2854,7 +2854,6 @@ compare_vote_routerstatus_entries(const void **_a, const void **_b) int networkstatus_verify_bw_weights(networkstatus_t *ns, int consensus_method) { - int64_t weight_scale; int64_t G=0, M=0, E=0, D=0, T=0; double Wgg, Wgm, Wgd, Wmg, Wmm, Wme, Wmd, Weg, Wem, Wee, Wed; double Gtotal=0, Mtotal=0, Etotal=0; @@ -2862,7 +2861,8 @@ networkstatus_verify_bw_weights(networkstatus_t *ns, int consensus_method) int valid = 1; (void) consensus_method; - weight_scale = networkstatus_get_weight_scale_param(ns); + const int64_t weight_scale = networkstatus_get_weight_scale_param(ns); + tor_assert(weight_scale >= 1); Wgg = networkstatus_get_bw_weight(ns, "Wgg", -1); Wgm = networkstatus_get_bw_weight(ns, "Wgm", -1); Wgd = networkstatus_get_bw_weight(ns, "Wgd", -1);

1 0

[tor/master] Coverity deadcode shenanigans on BUG() macro.
by nickm＠torproject.org 28 Jul '17

28 Jul '17

commit 602c52cad486516defc9d5ed375effd74cfe4529 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 28 10:02:38 2017 -0400 Coverity deadcode shenanigans on BUG() macro. We don't actually want Coverity to complain when a BUG() check can never fail, since such checks can prevent us from introducing bugs later on. Closes ticket 23054. Closes CID 1415720, 1415724. --- changes/bug23054 | 4 ++++ src/common/util_bug.c | 4 ++++ src/common/util_bug.h | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/changes/bug23054 b/changes/bug23054 new file mode 100644 index 000000000..39006cd80 --- /dev/null +++ b/changes/bug23054 @@ -0,0 +1,4 @@ + o Minor features (static analysis): + - The BUG() macro has been changed slightly so that Coverity no + longer complains about dead code if the bug is impossible. Closes + ticket 23054. diff --git a/src/common/util_bug.c b/src/common/util_bug.c index 3d990e370..cc1ac2ff8 100644 --- a/src/common/util_bug.c +++ b/src/common/util_bug.c @@ -13,6 +13,10 @@ #include "backtrace.h" #include "container.h" +#ifdef __COVERITY__ +int bug_macro_deadcode_dummy__ = 0; +#endif + #ifdef TOR_UNIT_TESTS static void (*failed_assertion_cb)(void) = NULL; static int n_bugs_to_capture = 0; diff --git a/src/common/util_bug.h b/src/common/util_bug.h index ae7e7a37f..de39317d1 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -59,10 +59,13 @@ */ #ifdef __COVERITY__ +extern int bug_macro_deadcode_dummy__; #undef BUG // Coverity defines this in global headers; let's override it. This is a // magic coverity-only preprocessor thing. -#nodef BUG(x) ((x)?(__coverity_panic__(),1):0) +// We use this "deadcode_dummy__" trick to prevent coverity from +// complaining about unreachable bug cases. +#nodef BUG(x) ((x)?(__coverity_panic__(),1):(0+bug_macro_deadcode_dummy__)) #endif #if defined(__COVERITY__) || defined(__clang_analyzer__)

1 0

[tor/release-0.3.1] Fix an unreachable memory leak in the unit tests
by nickm＠torproject.org 28 Jul '17

28 Jul '17

commit eb677c5870ad67e0aa883d700f630c7a9ee99af3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 28 09:52:34 2017 -0400 Fix an unreachable memory leak in the unit tests This is CID 1415726. --- src/test/test_hs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index b4817a21e..5aae6c5b9 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -572,6 +572,7 @@ test_single_onion_poisoning(void *arg) char *dir2 = tor_strdup(get_fname_rnd("test_hs_dir2")); smartlist_t *services = smartlist_new(); char *poison_path = NULL; + char *err_msg = NULL; /* No services, no service to verify, no problem! */ mock_options->HiddenServiceSingleHopMode = 0; @@ -607,7 +608,6 @@ test_single_onion_poisoning(void *arg) /* Add port to service 1 */ service_1->ports = smartlist_new(); service_2->ports = smartlist_new(); - char *err_msg = NULL; rend_service_port_config_t *port1 = rend_service_parse_port_config("80", " ", &err_msg); tt_assert(port1); @@ -806,6 +806,7 @@ test_single_onion_poisoning(void *arg) rend_service_free(service_2); UNMOCK(get_options); tor_free(mock_options->DataDirectory); + tor_free(err_msg); } static rend_service_t *

1 0

[tor/master] Fix an unreachable memory leak in the unit tests
by nickm＠torproject.org 28 Jul '17

28 Jul '17

commit eb677c5870ad67e0aa883d700f630c7a9ee99af3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 28 09:52:34 2017 -0400 Fix an unreachable memory leak in the unit tests This is CID 1415726. --- src/test/test_hs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index b4817a21e..5aae6c5b9 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -572,6 +572,7 @@ test_single_onion_poisoning(void *arg) char *dir2 = tor_strdup(get_fname_rnd("test_hs_dir2")); smartlist_t *services = smartlist_new(); char *poison_path = NULL; + char *err_msg = NULL; /* No services, no service to verify, no problem! */ mock_options->HiddenServiceSingleHopMode = 0; @@ -607,7 +608,6 @@ test_single_onion_poisoning(void *arg) /* Add port to service 1 */ service_1->ports = smartlist_new(); service_2->ports = smartlist_new(); - char *err_msg = NULL; rend_service_port_config_t *port1 = rend_service_parse_port_config("80", " ", &err_msg); tt_assert(port1); @@ -806,6 +806,7 @@ test_single_onion_poisoning(void *arg) rend_service_free(service_2); UNMOCK(get_options); tor_free(mock_options->DataDirectory); + tor_free(err_msg); } static rend_service_t *

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 28 Jul '17

28 Jul '17

commit 75eaca4e810fcabffea3b23b2ab9460fac020aa5 Merge: 3205700bc eb677c587 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 28 09:54:39 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/test/test_hs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 28 Jul '17

28 Jul '17

commit 5f0fa480dd94f4fec7b8b026dbd0a524f7b9c786 Merge: 6252e04a3 eb677c587 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 28 09:54:39 2017 -0400 Merge branch 'maint-0.3.1' src/test/test_hs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --cc src/test/test_hs.c index 093c7ec35,5aae6c5b9..48acd9180 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@@ -661,9 -572,19 +661,10 @@@ test_single_onion_poisoning(void *arg char *dir2 = tor_strdup(get_fname_rnd("test_hs_dir2")); smartlist_t *services = smartlist_new(); char *poison_path = NULL; + char *err_msg = NULL; - /* No services, no service to verify, no problem! */ - mock_options->HiddenServiceSingleHopMode = 0; - mock_options->HiddenServiceNonAnonymousMode = 0; - ret = rend_config_services(mock_options, 1); - tt_assert(ret == 0); - - /* Either way, no problem. */ mock_options->HiddenServiceSingleHopMode = 1; mock_options->HiddenServiceNonAnonymousMode = 1; - ret = rend_config_services(mock_options, 1); - tt_assert(ret == 0); /* Create the data directory, and, if the correct bit in arg is set, * create a directory for that service.

1 0

[tor/maint-0.3.1] Fix an unreachable memory leak in the unit tests
by nickm＠torproject.org 28 Jul '17

28 Jul '17

commit eb677c5870ad67e0aa883d700f630c7a9ee99af3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 28 09:52:34 2017 -0400 Fix an unreachable memory leak in the unit tests This is CID 1415726. --- src/test/test_hs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index b4817a21e..5aae6c5b9 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -572,6 +572,7 @@ test_single_onion_poisoning(void *arg) char *dir2 = tor_strdup(get_fname_rnd("test_hs_dir2")); smartlist_t *services = smartlist_new(); char *poison_path = NULL; + char *err_msg = NULL; /* No services, no service to verify, no problem! */ mock_options->HiddenServiceSingleHopMode = 0; @@ -607,7 +608,6 @@ test_single_onion_poisoning(void *arg) /* Add port to service 1 */ service_1->ports = smartlist_new(); service_2->ports = smartlist_new(); - char *err_msg = NULL; rend_service_port_config_t *port1 = rend_service_parse_port_config("80", " ", &err_msg); tt_assert(port1); @@ -806,6 +806,7 @@ test_single_onion_poisoning(void *arg) rend_service_free(service_2); UNMOCK(get_options); tor_free(mock_options->DataDirectory); + tor_free(err_msg); } static rend_service_t *

1 0

[tor/maint-0.3.1] Fix a small memory leak when parsing unix: ports twice
by nickm＠torproject.org 28 Jul '17

28 Jul '17

commit 9a0f38a349293f188a81b86d5b7639175a1cf334 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 28 09:49:42 2017 -0400 Fix a small memory leak when parsing unix: ports twice Fixes bug 23053; CID 1415725. --- changes/bug23053 | 5 +++++ src/or/config.c | 1 + 2 files changed, 6 insertions(+) diff --git a/changes/bug23053 b/changes/bug23053 new file mode 100644 index 000000000..082e23940 --- /dev/null +++ b/changes/bug23053 @@ -0,0 +1,5 @@ + o Minor bugfixes (memory leak): + - Fix a small memory leak when validating a configuration that + uses two or more AF_UNIX sockets for the same port type. + Fixes bug 23053; bugfix on 0.2.6.3-alpha. This is CID + 1415725. diff --git a/src/or/config.c b/src/or/config.c index 3693cdf83..d5298f0eb 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6877,6 +6877,7 @@ parse_port_config(smartlist_t *out, SMARTLIST_FOREACH(elts, char *, cp, tor_free(cp)); smartlist_clear(elts); tor_free(addrport); + tor_free(unix_socket_path); } if (warn_nonlocal && out) {

1 0

[tor/maint-0.3.1] Merge branch 'bug23053_029' into maint-0.3.1
by nickm＠torproject.org 28 Jul '17

28 Jul '17

commit 911e2dc5308d4cbd3f2c7e78e38055cb36c908fb Merge: af3079a49 9a0f38a34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 28 09:50:16 2017 -0400 Merge branch 'bug23053_029' into maint-0.3.1 changes/bug23053 | 5 +++++ src/or/config.c | 1 + 2 files changed, 6 insertions(+)

1 0