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

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 25 May '16

25 May '16

commit b7fac185a6c1b5b3543624234fc83a603e89af8d Merge: 28cbcd0 36b2b48 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 16:59:46 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18668 | 3 +++ src/test/testing_common.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.8] Merge branch 'bug18668_028' into maint-0.2.8
by nickm＠torproject.org 25 May '16

25 May '16

commit 36b2b483082eeb43e2aac80cf72b36b35cb48473 Merge: f2d614c 0f9b0b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 16:58:43 2016 -0400 Merge branch 'bug18668_028' into maint-0.2.8 changes/bug18668 | 3 +++ src/test/testing_common.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.8] Initialize networking _before_ initializing libevent in the tests
by nickm＠torproject.org 25 May '16

25 May '16

commit 0f9b0b8bfeb861d95c3872525c4a03e77675ccbd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 16 14:30:04 2016 -0400 Initialize networking _before_ initializing libevent in the tests This prevents WSANOTINITIALISED errors and fixes bug 18668. Bugfix on 0.2.8.1-alpha -- 1bac468882fd732460d8a25735131 specifically. --- changes/bug18668 | 3 +++ src/test/testing_common.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug18668 b/changes/bug18668 new file mode 100644 index 0000000..4b186b5 --- /dev/null +++ b/changes/bug18668 @@ -0,0 +1,3 @@ + o Minor bugfixes (tests): + - Avoid "WSANOTINITIALISED" warnings in the unit tests. Fixes bug 18668; + bugfix on 0.2.8.1-alpha. diff --git a/src/test/testing_common.c b/src/test/testing_common.c index aeb1fa7..39c3d02 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -242,6 +242,8 @@ main(int c, const char **v) options = options_new(); tor_threads_init(); + network_init(); + struct tor_libevent_cfg cfg; memset(&cfg, 0, sizeof(cfg)); tor_libevent_initialize(&cfg); @@ -284,7 +286,6 @@ main(int c, const char **v) return 1; } rep_hist_init(); - network_init(); setup_directory(); options_init(options); options->DataDirectory = tor_strdup(temp_dir);

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 25 May '16

25 May '16

commit 3e2d061397f451ba7b818d9b5b407523b2be4b89 Merge: e32281b 36b2b48 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 16:58:58 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug18668 | 3 +++ src/test/testing_common.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 25 May '16

25 May '16

commit 28cbcd033cadc9dfcabf4e179fc3649d8ec595e2 Merge: 44ea3dc f2d614c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 16:40:51 2016 -0400 Merge branch 'maint-0.2.8' src/or/routerlist.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 25 May '16

25 May '16

commit e32281b00095dbc764e995cf57290c9c1b0c9660 Merge: 693e48a f2d614c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 16:12:10 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 src/or/routerlist.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'bug19175_028_v2' into maint-0.2.8
by nickm＠torproject.org 25 May '16

25 May '16

commit f2d614c3d93aceac4954f7cd593213a5fcfbb123 Merge: 6d375f1 9cf6af7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 16:12:01 2016 -0400 Merge branch 'bug19175_028_v2' into maint-0.2.8 src/or/routerlist.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)

1 0

[tor/release-0.2.8] Fix a double-free bug in routerlist_reparse_old
by nickm＠torproject.org 25 May '16

25 May '16

commit 9cf6af76eb250dc0716185e349a92b2def6981d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 11:52:52 2016 -0400 Fix a double-free bug in routerlist_reparse_old I introduced this bug when I moved signing_key_cert into signed_descriptor_t. Bug not in any released Tor. Fixes bug 19175, and another case of 19128. Just like signed_descriptor_from_routerinfo(), routerlist_reparse_old() copies the fields from one signed_descriptor_t to another, and then clears the fields from the original that would have been double-freed by freeing the original. But when I fixed the s_d_f_r() bug [#19128] in 50cbf220994c7cec593, I missed the fact that the code was duplicated in r_p_o(). Duplicated code strikes again! For a longer-term solution here, I am not only adding the missing fix to r_p_o(): I am also extracting the duplicated code into a new function. Many thanks to toralf for patiently sending me stack traces until one made sense. --- src/or/routerlist.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index d49814f..a08b5f3 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2938,6 +2938,19 @@ signed_descriptor_free(signed_descriptor_t *sd) tor_free(sd); } +/** Copy src into dest, and steal all references inside src so that when + * we free src, we don't mess up dest. */ +static void +signed_descriptor_move(signed_descriptor_t *dest, + signed_descriptor_t *src) +{ + tor_assert(dest != src); + memcpy(dest, src, sizeof(signed_descriptor_t)); + src->signed_descriptor_body = NULL; + src->signing_key_cert = NULL; + dest->routerlist_index = -1; +} + /** Extract a signed_descriptor_t from a general routerinfo, and free the * routerinfo. */ @@ -2947,10 +2960,7 @@ signed_descriptor_from_routerinfo(routerinfo_t *ri) signed_descriptor_t *sd; tor_assert(ri->purpose == ROUTER_PURPOSE_GENERAL); sd = tor_malloc_zero(sizeof(signed_descriptor_t)); - memcpy(sd, &(ri->cache_info), sizeof(signed_descriptor_t)); - sd->routerlist_index = -1; - ri->cache_info.signed_descriptor_body = NULL; - ri->cache_info.signing_key_cert = NULL; + signed_descriptor_move(sd, &ri->cache_info); routerinfo_free(ri); return sd; } @@ -3436,9 +3446,7 @@ routerlist_reparse_old(routerlist_t *rl, signed_descriptor_t *sd) 0, 1, NULL, NULL); if (!ri) return NULL; - memcpy(&ri->cache_info, sd, sizeof(signed_descriptor_t)); - sd->signed_descriptor_body = NULL; /* Steal reference. */ - ri->cache_info.routerlist_index = -1; + signed_descriptor_move(&ri->cache_info, sd); routerlist_remove_old(rl, sd, -1);

1 0

[tor/master] Fix a double-free bug in routerlist_reparse_old
by nickm＠torproject.org 25 May '16

25 May '16

commit 9cf6af76eb250dc0716185e349a92b2def6981d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 11:52:52 2016 -0400 Fix a double-free bug in routerlist_reparse_old I introduced this bug when I moved signing_key_cert into signed_descriptor_t. Bug not in any released Tor. Fixes bug 19175, and another case of 19128. Just like signed_descriptor_from_routerinfo(), routerlist_reparse_old() copies the fields from one signed_descriptor_t to another, and then clears the fields from the original that would have been double-freed by freeing the original. But when I fixed the s_d_f_r() bug [#19128] in 50cbf220994c7cec593, I missed the fact that the code was duplicated in r_p_o(). Duplicated code strikes again! For a longer-term solution here, I am not only adding the missing fix to r_p_o(): I am also extracting the duplicated code into a new function. Many thanks to toralf for patiently sending me stack traces until one made sense. --- src/or/routerlist.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index d49814f..a08b5f3 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2938,6 +2938,19 @@ signed_descriptor_free(signed_descriptor_t *sd) tor_free(sd); } +/** Copy src into dest, and steal all references inside src so that when + * we free src, we don't mess up dest. */ +static void +signed_descriptor_move(signed_descriptor_t *dest, + signed_descriptor_t *src) +{ + tor_assert(dest != src); + memcpy(dest, src, sizeof(signed_descriptor_t)); + src->signed_descriptor_body = NULL; + src->signing_key_cert = NULL; + dest->routerlist_index = -1; +} + /** Extract a signed_descriptor_t from a general routerinfo, and free the * routerinfo. */ @@ -2947,10 +2960,7 @@ signed_descriptor_from_routerinfo(routerinfo_t *ri) signed_descriptor_t *sd; tor_assert(ri->purpose == ROUTER_PURPOSE_GENERAL); sd = tor_malloc_zero(sizeof(signed_descriptor_t)); - memcpy(sd, &(ri->cache_info), sizeof(signed_descriptor_t)); - sd->routerlist_index = -1; - ri->cache_info.signed_descriptor_body = NULL; - ri->cache_info.signing_key_cert = NULL; + signed_descriptor_move(sd, &ri->cache_info); routerinfo_free(ri); return sd; } @@ -3436,9 +3446,7 @@ routerlist_reparse_old(routerlist_t *rl, signed_descriptor_t *sd) 0, 1, NULL, NULL); if (!ri) return NULL; - memcpy(&ri->cache_info, sd, sizeof(signed_descriptor_t)); - sd->signed_descriptor_body = NULL; /* Steal reference. */ - ri->cache_info.routerlist_index = -1; + signed_descriptor_move(&ri->cache_info, sd); routerlist_remove_old(rl, sd, -1);

1 0

[tor/maint-0.2.8] Fix a double-free bug in routerlist_reparse_old
by nickm＠torproject.org 25 May '16

25 May '16

commit 9cf6af76eb250dc0716185e349a92b2def6981d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 11:52:52 2016 -0400 Fix a double-free bug in routerlist_reparse_old I introduced this bug when I moved signing_key_cert into signed_descriptor_t. Bug not in any released Tor. Fixes bug 19175, and another case of 19128. Just like signed_descriptor_from_routerinfo(), routerlist_reparse_old() copies the fields from one signed_descriptor_t to another, and then clears the fields from the original that would have been double-freed by freeing the original. But when I fixed the s_d_f_r() bug [#19128] in 50cbf220994c7cec593, I missed the fact that the code was duplicated in r_p_o(). Duplicated code strikes again! For a longer-term solution here, I am not only adding the missing fix to r_p_o(): I am also extracting the duplicated code into a new function. Many thanks to toralf for patiently sending me stack traces until one made sense. --- src/or/routerlist.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index d49814f..a08b5f3 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2938,6 +2938,19 @@ signed_descriptor_free(signed_descriptor_t *sd) tor_free(sd); } +/** Copy src into dest, and steal all references inside src so that when + * we free src, we don't mess up dest. */ +static void +signed_descriptor_move(signed_descriptor_t *dest, + signed_descriptor_t *src) +{ + tor_assert(dest != src); + memcpy(dest, src, sizeof(signed_descriptor_t)); + src->signed_descriptor_body = NULL; + src->signing_key_cert = NULL; + dest->routerlist_index = -1; +} + /** Extract a signed_descriptor_t from a general routerinfo, and free the * routerinfo. */ @@ -2947,10 +2960,7 @@ signed_descriptor_from_routerinfo(routerinfo_t *ri) signed_descriptor_t *sd; tor_assert(ri->purpose == ROUTER_PURPOSE_GENERAL); sd = tor_malloc_zero(sizeof(signed_descriptor_t)); - memcpy(sd, &(ri->cache_info), sizeof(signed_descriptor_t)); - sd->routerlist_index = -1; - ri->cache_info.signed_descriptor_body = NULL; - ri->cache_info.signing_key_cert = NULL; + signed_descriptor_move(sd, &ri->cache_info); routerinfo_free(ri); return sd; } @@ -3436,9 +3446,7 @@ routerlist_reparse_old(routerlist_t *rl, signed_descriptor_t *sd) 0, 1, NULL, NULL); if (!ri) return NULL; - memcpy(&ri->cache_info, sd, sizeof(signed_descriptor_t)); - sd->signed_descriptor_body = NULL; /* Steal reference. */ - ri->cache_info.routerlist_index = -1; + signed_descriptor_move(&ri->cache_info, sd); routerlist_remove_old(rl, sd, -1);

1 0