June 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit feddba6f8b5af92cc7618d09c99b3290d7372174 Merge: b2ce815bd eef77227e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

[tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit eef77227efce958382e3b221d86e6dba3b4a058a Merge: d124cfc05 d235e523d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:57:41 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit feddba6f8b5af92cc7618d09c99b3290d7372174 Merge: b2ce815bd eef77227e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

[tor/master] Merge branch 'ticket33290_v2_042' into maint-0.4.2
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit d235e523d5283591c0d44c934f1e04eafe09b19a Merge: a692b87f8 393bbd823 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:57:13 2020 -0400 Merge branch 'ticket33290_v2_042' into maint-0.4.2 changes/ticket33290 | 4 ++++ src/core/or/circuitmux.c | 8 ++++++-- src/core/or/circuitmux_ewma.c | 12 +++++++++--- 3 files changed, 19 insertions(+), 5 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.4'
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 86aa84e634e05de44937f6fb0c593e441ad455b6 Merge: 5b47a58d1 feddba6f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:57:50 2020 -0400 Merge branch 'maint-0.4.4'

1 0

[tor/release-0.4.2] Use more memory poisoning and better asserts around ewma code
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit 80e3dc47272c9ba423d40ce367fb99d39c3150ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 12 14:17:19 2020 -0500 Use more memory poisoning and better asserts around ewma code Attempt to diagnose 32464; fixes 33290. --- changes/ticket33290 | 4 ++++ src/core/or/circuitmux.c | 8 ++++++-- src/core/or/circuitmux_ewma.c | 11 ++++++++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/changes/ticket33290 b/changes/ticket33290 new file mode 100644 index 000000000..882764020 --- /dev/null +++ b/changes/ticket33290 @@ -0,0 +1,4 @@ + o Minor features (diagnostic): + - Improve assertions and add some memory-poisoning code to try to track + down possible causes of a rare crash (32564) in the EWMA code. + Closes ticket 33290. diff --git a/src/core/or/circuitmux.c b/src/core/or/circuitmux.c index b2628bec3..72f6ba662 100644 --- a/src/core/or/circuitmux.c +++ b/src/core/or/circuitmux.c @@ -79,6 +79,8 @@ #include "core/or/destroy_cell_queue_st.h" #include "core/or/or_circuit_st.h" +#include "lib/crypt_ops/crypto_util.h" + /* * Private typedefs for circuitmux.c */ @@ -973,7 +975,10 @@ circuitmux_detach_circuit,(circuitmux_t *cmux, circuit_t *circ)) /* Now remove it from the map */ HT_REMOVE(chanid_circid_muxinfo_map, cmux->chanid_circid_map, hashent); - /* Free the hash entry */ + /* Wipe and free the hash entry */ + // This isn't sensitive, but we want to be sure to know if we're accessing + // this accidentally. + memwipe(hashent, 0xef, sizeof(hashent)); tor_free(hashent); } } @@ -1334,4 +1339,3 @@ circuitmux_compare_muxes, (circuitmux_t *cmux_1, circuitmux_t *cmux_2)) return 0; } } - diff --git a/src/core/or/circuitmux_ewma.c b/src/core/or/circuitmux_ewma.c index 3f83c3fd5..606b755e2 100644 --- a/src/core/or/circuitmux_ewma.c +++ b/src/core/or/circuitmux_ewma.c @@ -147,7 +147,9 @@ TO_EWMA_POL_DATA(circuitmux_policy_data_t *pol) { if (!pol) return NULL; else { - tor_assert(pol->magic == EWMA_POL_DATA_MAGIC); + tor_assertf(pol->magic == EWMA_POL_DATA_MAGIC, + "Mismatch: %"PRIu32" != %"PRIu32, + pol->magic, EWMA_POL_DATA_MAGIC); return DOWNCAST(ewma_policy_data_t, pol); } } @@ -162,7 +164,9 @@ TO_EWMA_POL_CIRC_DATA(circuitmux_policy_circ_data_t *pol) { if (!pol) return NULL; else { - tor_assert(pol->magic == EWMA_POL_CIRC_DATA_MAGIC); + tor_assertf(pol->magic == EWMA_POL_CIRC_DATA_MAGIC, + "Mismatch: %"PRIu32" != %"PRIu32, + pol->magic, EWMA_POL_CIRC_DATA_MAGIC); return DOWNCAST(ewma_policy_circ_data_t, pol); } } @@ -295,6 +299,7 @@ ewma_free_cmux_data(circuitmux_t *cmux, pol = TO_EWMA_POL_DATA(pol_data); smartlist_free(pol->active_circuit_pqueue); + pol->base_.magic = 0xDEAD901C; tor_free(pol); } @@ -361,7 +366,7 @@ ewma_free_circ_data(circuitmux_t *cmux, if (!pol_circ_data) return; cdata = TO_EWMA_POL_CIRC_DATA(pol_circ_data); - + cdata->base_.magic = 0xDEADC14C; tor_free(cdata); }

1 0

[tor/release-0.4.3] Merge branch 'ticket33290_v2_042' into maint-0.4.2
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit d235e523d5283591c0d44c934f1e04eafe09b19a Merge: a692b87f8 393bbd823 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:57:13 2020 -0400 Merge branch 'ticket33290_v2_042' into maint-0.4.2 changes/ticket33290 | 4 ++++ src/core/or/circuitmux.c | 8 ++++++-- src/core/or/circuitmux_ewma.c | 12 +++++++++--- 3 files changed, 19 insertions(+), 5 deletions(-)

1 0

[tor/release-0.4.2] Wipe the entire hashent structure, not just the first sizeof(void*)
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit c1649ab01522f6258fc2555869cbf3abb7535515 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 14 08:15:37 2020 -0500 Wipe the entire hashent structure, not just the first sizeof(void*) --- src/core/or/circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/or/circuitmux.c b/src/core/or/circuitmux.c index 72f6ba662..4b19a12e3 100644 --- a/src/core/or/circuitmux.c +++ b/src/core/or/circuitmux.c @@ -978,7 +978,7 @@ circuitmux_detach_circuit,(circuitmux_t *cmux, circuit_t *circ)) /* Wipe and free the hash entry */ // This isn't sensitive, but we want to be sure to know if we're accessing // this accidentally. - memwipe(hashent, 0xef, sizeof(hashent)); + memwipe(hashent, 0xef, sizeof(*hashent)); tor_free(hashent); } }

1 0

[tor/release-0.4.2] Merge branch 'ticket33290_v2_042' into maint-0.4.2
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit d235e523d5283591c0d44c934f1e04eafe09b19a Merge: a692b87f8 393bbd823 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 29 13:57:13 2020 -0400 Merge branch 'ticket33290_v2_042' into maint-0.4.2 changes/ticket33290 | 4 ++++ src/core/or/circuitmux.c | 8 ++++++-- src/core/or/circuitmux_ewma.c | 12 +++++++++--- 3 files changed, 19 insertions(+), 5 deletions(-)

1 0

[tor/release-0.4.2] Before freeing ewma objects, use memwipe instead of resetting magic.
by nickm＠torproject.org 29 Jun '20

29 Jun '20

commit fff1054d17c8e869c38d4ca1c68ed74a7e82e393 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 13 09:11:35 2020 -0500 Before freeing ewma objects, use memwipe instead of resetting magic. --- src/core/or/circuitmux_ewma.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/or/circuitmux_ewma.c b/src/core/or/circuitmux_ewma.c index 606b755e2..07f83af0f 100644 --- a/src/core/or/circuitmux_ewma.c +++ b/src/core/or/circuitmux_ewma.c @@ -38,6 +38,7 @@ #include "core/or/circuitmux.h" #include "core/or/circuitmux_ewma.h" #include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_util.h" #include "feature/nodelist/networkstatus.h" #include "app/config/or_options_st.h" @@ -299,7 +300,7 @@ ewma_free_cmux_data(circuitmux_t *cmux, pol = TO_EWMA_POL_DATA(pol_data); smartlist_free(pol->active_circuit_pqueue); - pol->base_.magic = 0xDEAD901C; + memwipe(pol, 0xda, sizeof(ewma_policy_data_t)); tor_free(pol); } @@ -366,7 +367,7 @@ ewma_free_circ_data(circuitmux_t *cmux, if (!pol_circ_data) return; cdata = TO_EWMA_POL_CIRC_DATA(pol_circ_data); - cdata->base_.magic = 0xDEADC14C; + memwipe(cdata, 0xdc, sizeof(ewma_policy_circ_data_t)); tor_free(cdata); }

1 0