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

[tor/master] Restore sys/random.h inclusion for getentropy()
by nickm＠torproject.org 07 May '18

07 May '18

commit 9326abe16ac720346885e0ac555d6625233e198c Author: Taylor Yu <catalyst(a)torproject.org> Date: Mon May 7 12:43:39 2018 -0500 Restore sys/random.h inclusion for getentropy() Code movement for the refactoring for ticket 24658 didn't copy the inclusion of sys/random.h, which is needed to get a prototype for getentropy() on macOS 10.12 Sierra. It also didn't copy the inclusion of sys/syscall.h, which might prevent the getrandom() syscall from being properly detected. Move these inclusions. Bug not in any released Tor. --- src/common/crypto.c | 6 ------ src/common/crypto_rand.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index e148878be..052f31723 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -60,12 +60,6 @@ ENABLE_GCC_WARNING(redundant-decls) #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#ifdef HAVE_SYS_SYSCALL_H -#include <sys/syscall.h> -#endif -#ifdef HAVE_SYS_RANDOM_H -#include <sys/random.h> -#endif #include "torlog.h" #include "torint.h" diff --git a/src/common/crypto_rand.c b/src/common/crypto_rand.c index 5abf0b096..df2e2f65d 100644 --- a/src/common/crypto_rand.c +++ b/src/common/crypto_rand.c @@ -55,6 +55,12 @@ ENABLE_GCC_WARNING(redundant-decls) #ifdef HAVE_UNISTD_H #include <unistd.h> #endif +#ifdef HAVE_SYS_SYSCALL_H +#include <sys/syscall.h> +#endif +#ifdef HAVE_SYS_RANDOM_H +#include <sys/random.h> +#endif /** * How many bytes of entropy we add at once.

1 0

[tor/master] Merge remote-tracking branch 'catalyst-github/bug26036'
by nickm＠torproject.org 07 May '18

07 May '18

commit 5ad72bc1f50253c7d080e5d1f8f254f01bb1f19b Merge: 17236a584 9326abe16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 14:38:26 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug26036' src/common/crypto.c | 6 ------ src/common/crypto_rand.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3
by nickm＠torproject.org 07 May '18

07 May '18

commit 46002aa69114d84ea244558baeef5d07f389d9fc Merge: 4c6a407b9 35e790211 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 13:33:12 2018 -0400 Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3 changes/bug25733 | 4 ++++ src/or/circuitstats.c | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-)

1 0

[tor/master] Bug 25733: Avoid assert failure if all circuits time out.
by nickm＠torproject.org 07 May '18

07 May '18

commit 35e79021165a4dcabff807002e5b49cea593edb6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 16 22:49:27 2018 +0000 Bug 25733: Avoid assert failure if all circuits time out. Prior to #23100, we were not counting HS circuit build times in our calculation of the timeout. This could lead to a condition where our timeout was set too low, based on non HS circuit build times, and then we would abandon all HS circuits, storing no valid timeouts in the histogram. This commit avoids the assert. --- changes/bug25733 | 4 ++++ src/or/circuitstats.c | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/changes/bug25733 b/changes/bug25733 new file mode 100644 index 000000000..775c1ae00 --- /dev/null +++ b/changes/bug25733 @@ -0,0 +1,4 @@ + o Minor bugfixes (Assert crash): + - Avoid an assert in the circuit build timeout code if we fail to + allow any circuits to actually complete. Fixes bug 25733; + bugfix on 0.2.2.2-alpha. diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index b8421a3c7..7d83d6a5d 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -767,11 +767,23 @@ circuit_build_times_get_xm(circuit_build_times_t *cbt) histogram[nth_max_bin[n]]); } - /* The following assert is safe, because we don't get called when we - * haven't observed at least CBT_MIN_MIN_CIRCUITS_TO_OBSERVE circuits. */ + /* bin_counts can become zero if all of our last CBT_NCIRCUITS_TO_OBSERVE + * circuits were abandoned before they completed. This shouldn't happen, + * though. We should have reset/re-learned a lower timeout first. */ + if (bin_counts == 0) { + ret = 0; + log_warn(LD_CIRC, + "No valid circuit build time data out of %d times, %u modes, " + "have_timeout=%d, %lfms", cbt->total_build_times, num_modes, + cbt->have_computed_timeout, cbt->timeout_ms); + goto done; + } + tor_assert(bin_counts > 0); ret /= bin_counts; + + done: tor_free(histogram); tor_free(nth_max_bin); @@ -1057,6 +1069,10 @@ circuit_build_times_update_alpha(circuit_build_times_t *cbt) * and less frechet-like. */ cbt->Xm = circuit_build_times_get_xm(cbt); + /* If Xm came back 0, then too many circuits were abandoned. */ + if (cbt->Xm == 0) + return 0; + tor_assert(cbt->Xm > 0); for (i=0; i< CBT_NCIRCUITS_TO_OBSERVE; i++) {

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 07 May '18

07 May '18

commit 17236a58429dab6bf0536a64b90c4ec7f25985b8 Merge: 2c5841a8b 46002aa69 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 13:33:19 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25733 | 4 ++++ src/or/circuitstats.c | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Bug 25733: Avoid assert failure if all circuits time out.
by nickm＠torproject.org 07 May '18

07 May '18

commit 35e79021165a4dcabff807002e5b49cea593edb6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 16 22:49:27 2018 +0000 Bug 25733: Avoid assert failure if all circuits time out. Prior to #23100, we were not counting HS circuit build times in our calculation of the timeout. This could lead to a condition where our timeout was set too low, based on non HS circuit build times, and then we would abandon all HS circuits, storing no valid timeouts in the histogram. This commit avoids the assert. --- changes/bug25733 | 4 ++++ src/or/circuitstats.c | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/changes/bug25733 b/changes/bug25733 new file mode 100644 index 000000000..775c1ae00 --- /dev/null +++ b/changes/bug25733 @@ -0,0 +1,4 @@ + o Minor bugfixes (Assert crash): + - Avoid an assert in the circuit build timeout code if we fail to + allow any circuits to actually complete. Fixes bug 25733; + bugfix on 0.2.2.2-alpha. diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index b8421a3c7..7d83d6a5d 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -767,11 +767,23 @@ circuit_build_times_get_xm(circuit_build_times_t *cbt) histogram[nth_max_bin[n]]); } - /* The following assert is safe, because we don't get called when we - * haven't observed at least CBT_MIN_MIN_CIRCUITS_TO_OBSERVE circuits. */ + /* bin_counts can become zero if all of our last CBT_NCIRCUITS_TO_OBSERVE + * circuits were abandoned before they completed. This shouldn't happen, + * though. We should have reset/re-learned a lower timeout first. */ + if (bin_counts == 0) { + ret = 0; + log_warn(LD_CIRC, + "No valid circuit build time data out of %d times, %u modes, " + "have_timeout=%d, %lfms", cbt->total_build_times, num_modes, + cbt->have_computed_timeout, cbt->timeout_ms); + goto done; + } + tor_assert(bin_counts > 0); ret /= bin_counts; + + done: tor_free(histogram); tor_free(nth_max_bin); @@ -1057,6 +1069,10 @@ circuit_build_times_update_alpha(circuit_build_times_t *cbt) * and less frechet-like. */ cbt->Xm = circuit_build_times_get_xm(cbt); + /* If Xm came back 0, then too many circuits were abandoned. */ + if (cbt->Xm == 0) + return 0; + tor_assert(cbt->Xm > 0); for (i=0; i< CBT_NCIRCUITS_TO_OBSERVE; i++) {

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3
by nickm＠torproject.org 07 May '18

07 May '18

commit 46002aa69114d84ea244558baeef5d07f389d9fc Merge: 4c6a407b9 35e790211 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 13:33:12 2018 -0400 Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3 changes/bug25733 | 4 ++++ src/or/circuitstats.c | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 07 May '18

07 May '18

commit 0e4f7b56a2da9583ee4749b7477655a01265715b Merge: 40456054e 46002aa69 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 13:33:19 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25733 | 4 ++++ src/or/circuitstats.c | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.3] Bug 25733: Avoid assert failure if all circuits time out.
by nickm＠torproject.org 07 May '18

07 May '18

commit 35e79021165a4dcabff807002e5b49cea593edb6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 16 22:49:27 2018 +0000 Bug 25733: Avoid assert failure if all circuits time out. Prior to #23100, we were not counting HS circuit build times in our calculation of the timeout. This could lead to a condition where our timeout was set too low, based on non HS circuit build times, and then we would abandon all HS circuits, storing no valid timeouts in the histogram. This commit avoids the assert. --- changes/bug25733 | 4 ++++ src/or/circuitstats.c | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/changes/bug25733 b/changes/bug25733 new file mode 100644 index 000000000..775c1ae00 --- /dev/null +++ b/changes/bug25733 @@ -0,0 +1,4 @@ + o Minor bugfixes (Assert crash): + - Avoid an assert in the circuit build timeout code if we fail to + allow any circuits to actually complete. Fixes bug 25733; + bugfix on 0.2.2.2-alpha. diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index b8421a3c7..7d83d6a5d 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -767,11 +767,23 @@ circuit_build_times_get_xm(circuit_build_times_t *cbt) histogram[nth_max_bin[n]]); } - /* The following assert is safe, because we don't get called when we - * haven't observed at least CBT_MIN_MIN_CIRCUITS_TO_OBSERVE circuits. */ + /* bin_counts can become zero if all of our last CBT_NCIRCUITS_TO_OBSERVE + * circuits were abandoned before they completed. This shouldn't happen, + * though. We should have reset/re-learned a lower timeout first. */ + if (bin_counts == 0) { + ret = 0; + log_warn(LD_CIRC, + "No valid circuit build time data out of %d times, %u modes, " + "have_timeout=%d, %lfms", cbt->total_build_times, num_modes, + cbt->have_computed_timeout, cbt->timeout_ms); + goto done; + } + tor_assert(bin_counts > 0); ret /= bin_counts; + + done: tor_free(histogram); tor_free(nth_max_bin); @@ -1057,6 +1069,10 @@ circuit_build_times_update_alpha(circuit_build_times_t *cbt) * and less frechet-like. */ cbt->Xm = circuit_build_times_get_xm(cbt); + /* If Xm came back 0, then too many circuits were abandoned. */ + if (cbt->Xm == 0) + return 0; + tor_assert(cbt->Xm > 0); for (i=0; i< CBT_NCIRCUITS_TO_OBSERVE; i++) {

1 0

[tor/maint-0.3.3] Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3
by nickm＠torproject.org 07 May '18

07 May '18

commit 46002aa69114d84ea244558baeef5d07f389d9fc Merge: 4c6a407b9 35e790211 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 7 13:33:12 2018 -0400 Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3 changes/bug25733 | 4 ++++ src/or/circuitstats.c | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-)

1 0