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

[tor/master] Add a safe guard to avoid using a zeroed voting schedule
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit e67f4441eb2646368e3e7cb1bcee403667b786f0 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 7 11:14:45 2017 -0500 Add a safe guard to avoid using a zeroed voting schedule dirvote_get_next_valid_after_time() is the only public function that uses the voting schedule outside of the dirvote subsystem so if it is zeroed, recalculate its timing if we can that is if a consensus exists. Part of #24161 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/dirvote.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index c5ceefecb..33e5ea7d5 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2859,6 +2859,13 @@ static voting_schedule_t voting_schedule; time_t dirvote_get_next_valid_after_time(void) { + /* This is a safe guard in order to make sure that the voting schedule + * static object is at least initialized. Using this function with a zeroed + * voting schedule can lead to bugs. */ + if (tor_mem_is_zero((const char *) &voting_schedule, + sizeof(voting_schedule))) { + dirvote_recalculate_timing(get_options(), time(NULL)); + } return voting_schedule.interval_starts; }

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit c58471325a48f8181d32d45ef75cd23ffd942181 Merge: c7d1d1ad2 e67f4441e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 7 14:00:18 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2 src/or/dirvote.c | 7 +++++++ src/or/networkstatus.c | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.2] Recalculate voting schedule first when getting a new consensus
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit 8171d9f50f985de743a415ae5bf61b97e91ce8c8 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 7 11:08:12 2017 -0500 Recalculate voting schedule first when getting a new consensus Because the HS and SR subsystems can use the voting schedule early (with the changes in #23623 making the SR subsystem using the static voting schedule object), we need to recalculate the schedule very early when setting the new consensus. Fixes #24161 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/networkstatus.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 93bb8643d..2660e6a32 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1939,13 +1939,17 @@ networkstatus_set_current_consensus(const char *consensus, } if (is_usable_flavor) { + /* The "current" consensus has just been set and it is a usable flavor so + * the first thing we need to do is recalculate the voting schedule static + * object so we can use the timings in there needed by some subsystems + * such as hidden service and shared random. */ + dirvote_recalculate_timing(options, now); + nodelist_set_consensus(c); /* XXXXNM Microdescs: needs a non-ns variant. ???? NM*/ update_consensus_networkstatus_fetch_time(now); - dirvote_recalculate_timing(options, now); - /* Update ewma and adjust policy if needed; first cache the old value */ old_ewma_enabled = cell_ewma_enabled(); /* Change the cell EWMA settings */

1 0

[tor/release-0.3.2] Add a safe guard to avoid using a zeroed voting schedule
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit e67f4441eb2646368e3e7cb1bcee403667b786f0 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 7 11:14:45 2017 -0500 Add a safe guard to avoid using a zeroed voting schedule dirvote_get_next_valid_after_time() is the only public function that uses the voting schedule outside of the dirvote subsystem so if it is zeroed, recalculate its timing if we can that is if a consensus exists. Part of #24161 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/dirvote.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index c5ceefecb..33e5ea7d5 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2859,6 +2859,13 @@ static voting_schedule_t voting_schedule; time_t dirvote_get_next_valid_after_time(void) { + /* This is a safe guard in order to make sure that the voting schedule + * static object is at least initialized. Using this function with a zeroed + * voting schedule can lead to bugs. */ + if (tor_mem_is_zero((const char *) &voting_schedule, + sizeof(voting_schedule))) { + dirvote_recalculate_timing(get_options(), time(NULL)); + } return voting_schedule.interval_starts; }

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit c58471325a48f8181d32d45ef75cd23ffd942181 Merge: c7d1d1ad2 e67f4441e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 7 14:00:18 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2 src/or/dirvote.c | 7 +++++++ src/or/networkstatus.c | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit ea5ea5f5542b314d3365a09427cf74340b5093e4 Merge: 91e82baa8 c58471325 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 7 14:01:10 2017 -0500 Merge branch 'maint-0.3.2' src/or/dirvote.c | 7 +++++++ src/or/networkstatus.c | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit 91e82baa8d82e147e490922d5447596cdc621054 Merge: c6c4a421f c7d1d1ad2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 7 13:22:37 2017 -0500 Merge branch 'maint-0.3.2' "ours" merge to avoid version bump.

1 0

[tor/release-0.3.2] Bump to 0.3.2.4-alpha
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit c7d1d1ad2e398e92a6839f61df310557b3ca44ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 7 13:22:27 2017 -0500 Bump to 0.3.2.4-alpha --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 592e04a5d..f1e512c2c 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.2.3-alpha-dev]) +AC_INIT([tor],[0.3.2.4-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 4c1f709a2..25c3378f3 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.2.3-alpha-dev" +!define VERSION "0.3.2.4-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 38c6d5118..eebe97c44 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.2.3-alpha-dev" +#define VERSION "0.3.2.4-alpha"

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit 0c8eebd90c5e745bb60339bea6fee79f19d0d6fd Merge: 89ed93e46 c7d1d1ad2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 7 13:22:47 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.2] Bump to 0.3.2.4-alpha
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit c7d1d1ad2e398e92a6839f61df310557b3ca44ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 7 13:22:27 2017 -0500 Bump to 0.3.2.4-alpha --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 592e04a5d..f1e512c2c 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.2.3-alpha-dev]) +AC_INIT([tor],[0.3.2.4-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 4c1f709a2..25c3378f3 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.2.3-alpha-dev" +!define VERSION "0.3.2.4-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 38c6d5118..eebe97c44 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.2.3-alpha-dev" +#define VERSION "0.3.2.4-alpha"

1 0