January 2019 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'ticket28879' into maint-0.3.5
by nickm＠torproject.org 04 Jan '19

04 Jan '19

commit c75cf802d3061633bf0679ce8df33660a3be9345 Merge: abdc6aede 16199a54a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 3 21:34:35 2019 -0500 Merge branch 'ticket28879' into maint-0.3.5 changes/ticket28879 | 5 +++++ src/feature/relay/dns.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 04 Jan '19

04 Jan '19

commit 98a1b8770cc6a52cd958d49882dbbadd6ae212f0 Merge: 7232f0493 c75cf802d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 3 21:34:43 2019 -0500 Merge branch 'maint-0.3.5' changes/ticket28879 | 5 +++++ src/feature/relay/dns.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Check hostname before using it in send_resolved_hostname_cell()
by nickm＠torproject.org 04 Jan '19

04 Jan '19

commit 16199a54a2b3f5ce94c6ca4248cbf44448ba95ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 17 09:14:16 2018 -0500 Check hostname before using it in send_resolved_hostname_cell() Also, turn an absent hostname into a BUG(), not a crash. Found by scan-build. Closes ticket 28879; bugfix on 0.1.2.7-alpha --- changes/ticket28879 | 5 +++++ src/feature/relay/dns.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/ticket28879 b/changes/ticket28879 new file mode 100644 index 000000000..126420f6c --- /dev/null +++ b/changes/ticket28879 @@ -0,0 +1,5 @@ + o Minor bugfixes (correctness): + - Fix an unreached code-path where we checked the value of "hostname" + inside send_resolved_hostnam_cell(). Previously, we used it before + checking it; now we check it first. Fixes bug 28879; bugfix on + 0.1.2.7-alpha. diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index bc507d47f..cc213ff8d 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -586,8 +586,11 @@ send_resolved_hostname_cell,(edge_connection_t *conn, char buf[RELAY_PAYLOAD_SIZE]; size_t buflen; uint32_t ttl; + + if (BUG(!hostname)) + return; + size_t namelen = strlen(hostname); - tor_assert(hostname); tor_assert(namelen < 256); ttl = dns_clip_ttl(conn->address_ttl);

1 0

[tor/release-0.3.5] Merge branch 'ticket28879' into maint-0.3.5
by nickm＠torproject.org 04 Jan '19

04 Jan '19

commit c75cf802d3061633bf0679ce8df33660a3be9345 Merge: abdc6aede 16199a54a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 3 21:34:35 2019 -0500 Merge branch 'ticket28879' into maint-0.3.5 changes/ticket28879 | 5 +++++ src/feature/relay/dns.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 04 Jan '19

04 Jan '19

commit 06443680094275514c386ddadc2975ab836d6977 Merge: 3ef8d4fb1 c75cf802d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 3 21:34:43 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket28879 | 5 +++++ src/feature/relay/dns.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.5] Check hostname before using it in send_resolved_hostname_cell()
by nickm＠torproject.org 04 Jan '19

04 Jan '19

commit 16199a54a2b3f5ce94c6ca4248cbf44448ba95ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 17 09:14:16 2018 -0500 Check hostname before using it in send_resolved_hostname_cell() Also, turn an absent hostname into a BUG(), not a crash. Found by scan-build. Closes ticket 28879; bugfix on 0.1.2.7-alpha --- changes/ticket28879 | 5 +++++ src/feature/relay/dns.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/ticket28879 b/changes/ticket28879 new file mode 100644 index 000000000..126420f6c --- /dev/null +++ b/changes/ticket28879 @@ -0,0 +1,5 @@ + o Minor bugfixes (correctness): + - Fix an unreached code-path where we checked the value of "hostname" + inside send_resolved_hostnam_cell(). Previously, we used it before + checking it; now we check it first. Fixes bug 28879; bugfix on + 0.1.2.7-alpha. diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index bc507d47f..cc213ff8d 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -586,8 +586,11 @@ send_resolved_hostname_cell,(edge_connection_t *conn, char buf[RELAY_PAYLOAD_SIZE]; size_t buflen; uint32_t ttl; + + if (BUG(!hostname)) + return; + size_t namelen = strlen(hostname); - tor_assert(hostname); tor_assert(namelen < 256); ttl = dns_clip_ttl(conn->address_ttl);

1 0

[tor/maint-0.3.5] Merge branch 'ticket28879' into maint-0.3.5
by nickm＠torproject.org 04 Jan '19

04 Jan '19

commit c75cf802d3061633bf0679ce8df33660a3be9345 Merge: abdc6aede 16199a54a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 3 21:34:35 2019 -0500 Merge branch 'ticket28879' into maint-0.3.5 changes/ticket28879 | 5 +++++ src/feature/relay/dns.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/master] Fix dead-assignment warnings in test_config.c
by nickm＠torproject.org 04 Jan '19

04 Jan '19

commit 82fb40c8dc2f21753298559e79d898add80bf6b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 17 09:26:57 2018 -0500 Fix dead-assignment warnings in test_config.c Found by scan-build. --- src/test/test_config.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 5140c3c1a..67a43d669 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5783,6 +5783,7 @@ test_config_extended_fmt(void *arg) tt_str_op(lp->value, OP_EQ, "is back here"); tt_int_op(lp->command, OP_EQ, CONFIG_LINE_NORMAL); lp = lp->next; + tt_assert(!lp); config_free_lines(lines); /* Try with the "extended" flag enabled. */ @@ -5809,6 +5810,7 @@ test_config_extended_fmt(void *arg) tt_str_op(lp->value, OP_EQ, ""); tt_int_op(lp->command, OP_EQ, CONFIG_LINE_CLEAR); lp = lp->next; + tt_assert(!lp); done: config_free_lines(lines);

1 0

[tor/master] Fix dead assignment warning in test_hs_service.c
by nickm＠torproject.org 04 Jan '19

04 Jan '19

commit d58a597a55dba2ac468cbdef5172ecda1dc2344f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 17 09:28:08 2018 -0500 Fix dead assignment warning in test_hs_service.c --- src/test/test_hs_service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index ee2d71aa7..79cbd2e5d 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1396,7 +1396,6 @@ static void test_build_update_descriptors(void *arg) { int ret; - time_t now = time(NULL); node_t *node; hs_service_t *service; hs_service_intro_point_t *ip_cur, *ip_next; @@ -1422,7 +1421,8 @@ test_build_update_descriptors(void *arg) voting_schedule_recalculate_timing(get_options(), mock_ns.valid_after); update_approx_time(mock_ns.valid_after+1); - now = mock_ns.valid_after+1; + + time_t now = mock_ns.valid_after+1; /* Create a service without a current descriptor to trigger a build. */ service = helper_create_service();

1 0

[tor/master] Merge branch 'ticket28880'
by nickm＠torproject.org 04 Jan '19

04 Jan '19

commit 7232f04939f44146254c21086178c62cce1d3392 Merge: a7cbbf279 ce3d50104 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 3 21:33:40 2019 -0500 Merge branch 'ticket28880' src/test/test_config.c | 2 ++ src/test/test_hs_service.c | 7 +++++-- src/test/test_shared_random.c | 1 + 3 files changed, 8 insertions(+), 2 deletions(-)

1 0