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

[tor/maint-0.4.1] Give a more useful failure messgae when we fail to minherit().
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit 93ddc51cbd325ef3d5cf3a5b9948ff65c09fc5aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 29 09:21:45 2019 -0400 Give a more useful failure messgae when we fail to minherit(). Part of ticket 30686. --- src/lib/crypt_ops/crypto_rand_fast.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/crypt_ops/crypto_rand_fast.c b/src/lib/crypt_ops/crypto_rand_fast.c index b71ade81b..d2ce1a542 100644 --- a/src/lib/crypt_ops/crypto_rand_fast.c +++ b/src/lib/crypt_ops/crypto_rand_fast.c @@ -181,7 +181,11 @@ crypto_fast_rng_new_from_seed(const uint8_t *seed) #else /* We decided above that noinherit would always do _something_. Assert here * that we were correct. */ - tor_assert(inherit != INHERIT_RES_KEEP); + tor_assertf(inherit != INHERIT_RES_KEEP, + "We failed to create a non-inheritable memory region, even " + "though we believed such a failure to be impossible! This is " + "probably a bug in Tor support for your platform; please report " + "it."); #endif return result; }

1 0

[tor/maint-0.4.1] Merge branch 'tor-github/pr/1050' into maint-0.4.1
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit ea14fb136c6c771320d7c4ff6beab05d1dbc73aa Merge: ce89fe36c 5068ccab0 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 11 11:29:46 2019 -0400 Merge branch 'tor-github/pr/1050' into maint-0.4.1 changes/ticket30686 | 5 +++++ src/lib/crypt_ops/crypto_rand_fast.c | 6 +++++- src/lib/malloc/map_anon.c | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --cc src/lib/crypt_ops/crypto_rand_fast.c index c7f71a17c,d2ce1a542..e6ceb42cc --- a/src/lib/crypt_ops/crypto_rand_fast.c +++ b/src/lib/crypt_ops/crypto_rand_fast.c @@@ -181,8 -181,12 +181,12 @@@ crypto_fast_rng_new_from_seed(const uin #else /* We decided above that noinherit would always do _something_. Assert here * that we were correct. */ - tor_assert(inherit != INHERIT_RES_KEEP); + tor_assertf(inherit != INHERIT_RES_KEEP, + "We failed to create a non-inheritable memory region, even " + "though we believed such a failure to be impossible! This is " + "probably a bug in Tor support for your platform; please report " + "it."); -#endif +#endif /* defined(CHECK_PID) || ... */ return result; } diff --cc src/lib/malloc/map_anon.c index 219bd706c,6afea713d..0f6a4150c --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@@ -72,8 -68,13 +72,13 @@@ #define FLAG_NOINHERIT MADV_DONTFORK #endif -#endif +#endif /* defined(HAVE_MINHERIT) || ... */ + #if defined(HAVE_MINHERIT) && !defined(FLAG_ZERO) && !defined(FLAG_NOINHERIT) + #warn "minherit() is defined, but we couldn't find the right flag for it." + #warn "This is probably a bug in Tor's support for this platform." + #endif + /** * Helper: try to prevent the sz bytes at mem from being swapped * to disk. Return 0 on success or if the facility is not available on this

1 0

[tor/master] Give a more useful failure messgae when we fail to minherit().
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit 93ddc51cbd325ef3d5cf3a5b9948ff65c09fc5aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 29 09:21:45 2019 -0400 Give a more useful failure messgae when we fail to minherit(). Part of ticket 30686. --- src/lib/crypt_ops/crypto_rand_fast.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/crypt_ops/crypto_rand_fast.c b/src/lib/crypt_ops/crypto_rand_fast.c index b71ade81b..d2ce1a542 100644 --- a/src/lib/crypt_ops/crypto_rand_fast.c +++ b/src/lib/crypt_ops/crypto_rand_fast.c @@ -181,7 +181,11 @@ crypto_fast_rng_new_from_seed(const uint8_t *seed) #else /* We decided above that noinherit would always do _something_. Assert here * that we were correct. */ - tor_assert(inherit != INHERIT_RES_KEEP); + tor_assertf(inherit != INHERIT_RES_KEEP, + "We failed to create a non-inheritable memory region, even " + "though we believed such a failure to be impossible! This is " + "probably a bug in Tor support for your platform; please report " + "it."); #endif return result; }

1 0

[tor/maint-0.4.1] Give a compile warning when we don't have any flags for minherit().
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit cad0de35bd49064f5712f32a2b6e41ffe6e822e6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 29 09:22:18 2019 -0400 Give a compile warning when we don't have any flags for minherit(). Part of ticket 30686. --- src/lib/malloc/map_anon.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c index f4fda00bf..6afea713d 100644 --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@ -70,6 +70,11 @@ #endif +#if defined(HAVE_MINHERIT) && !defined(FLAG_ZERO) && !defined(FLAG_NOINHERIT) +#warn "minherit() is defined, but we couldn't find the right flag for it." +#warn "This is probably a bug in Tor's support for this platform." +#endif + /** * Helper: try to prevent the sz bytes at mem from being swapped * to disk. Return 0 on success or if the facility is not available on this

1 0

[tor/maint-0.4.1] Add a changes file for ticket 30686.
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit 5068ccab0b1849e836729c43a2ca891139cf107b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 29 09:23:13 2019 -0400 Add a changes file for ticket 30686. --- changes/ticket30686 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket30686 b/changes/ticket30686 new file mode 100644 index 000000000..36473c1a0 --- /dev/null +++ b/changes/ticket30686 @@ -0,0 +1,5 @@ + o Minor features (logging): + - Give a more useful assertion failure message if we think we have + minherit() but we fail to make a region non-inheritable. Give a + compile-time warning if our support for minherit() is + incomplete. Closes ticket 30686.

1 0

[tor/master] Give a compile warning when we don't have any flags for minherit().
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit cad0de35bd49064f5712f32a2b6e41ffe6e822e6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 29 09:22:18 2019 -0400 Give a compile warning when we don't have any flags for minherit(). Part of ticket 30686. --- src/lib/malloc/map_anon.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib/malloc/map_anon.c b/src/lib/malloc/map_anon.c index f4fda00bf..6afea713d 100644 --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@ -70,6 +70,11 @@ #endif +#if defined(HAVE_MINHERIT) && !defined(FLAG_ZERO) && !defined(FLAG_NOINHERIT) +#warn "minherit() is defined, but we couldn't find the right flag for it." +#warn "This is probably a bug in Tor's support for this platform." +#endif + /** * Helper: try to prevent the sz bytes at mem from being swapped * to disk. Return 0 on success or if the facility is not available on this

1 0

[tor/master] Add a changes file for ticket 30686.
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit 5068ccab0b1849e836729c43a2ca891139cf107b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 29 09:23:13 2019 -0400 Add a changes file for ticket 30686. --- changes/ticket30686 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket30686 b/changes/ticket30686 new file mode 100644 index 000000000..36473c1a0 --- /dev/null +++ b/changes/ticket30686 @@ -0,0 +1,5 @@ + o Minor features (logging): + - Give a more useful assertion failure message if we think we have + minherit() but we fail to make a region non-inheritable. Give a + compile-time warning if our support for minherit() is + incomplete. Closes ticket 30686.

1 0

[tor/master] Merge branch 'tor-github/pr/1050' into maint-0.4.1
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit ea14fb136c6c771320d7c4ff6beab05d1dbc73aa Merge: ce89fe36c 5068ccab0 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 11 11:29:46 2019 -0400 Merge branch 'tor-github/pr/1050' into maint-0.4.1 changes/ticket30686 | 5 +++++ src/lib/crypt_ops/crypto_rand_fast.c | 6 +++++- src/lib/malloc/map_anon.c | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --cc src/lib/crypt_ops/crypto_rand_fast.c index c7f71a17c,d2ce1a542..e6ceb42cc --- a/src/lib/crypt_ops/crypto_rand_fast.c +++ b/src/lib/crypt_ops/crypto_rand_fast.c @@@ -181,8 -181,12 +181,12 @@@ crypto_fast_rng_new_from_seed(const uin #else /* We decided above that noinherit would always do _something_. Assert here * that we were correct. */ - tor_assert(inherit != INHERIT_RES_KEEP); + tor_assertf(inherit != INHERIT_RES_KEEP, + "We failed to create a non-inheritable memory region, even " + "though we believed such a failure to be impossible! This is " + "probably a bug in Tor support for your platform; please report " + "it."); -#endif +#endif /* defined(CHECK_PID) || ... */ return result; } diff --cc src/lib/malloc/map_anon.c index 219bd706c,6afea713d..0f6a4150c --- a/src/lib/malloc/map_anon.c +++ b/src/lib/malloc/map_anon.c @@@ -72,8 -68,13 +72,13 @@@ #define FLAG_NOINHERIT MADV_DONTFORK #endif -#endif +#endif /* defined(HAVE_MINHERIT) || ... */ + #if defined(HAVE_MINHERIT) && !defined(FLAG_ZERO) && !defined(FLAG_NOINHERIT) + #warn "minherit() is defined, but we couldn't find the right flag for it." + #warn "This is probably a bug in Tor's support for this platform." + #endif + /** * Helper: try to prevent the sz bytes at mem from being swapped * to disk. Return 0 on success or if the facility is not available on this

1 0

[tor/master] Merge branch 'maint-0.4.1'
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit 35dd2d733bf9db0eca83caab93111fbc0cc1673e Merge: 3405a311d ea14fb136 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 11 11:30:05 2019 -0400 Merge branch 'maint-0.4.1' changes/ticket30686 | 5 +++++ src/lib/crypt_ops/crypto_rand_fast.c | 6 +++++- src/lib/malloc/map_anon.c | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-)

1 0

[torspec/master] Merge remote-tracking branch 'nickm/ticket29310'
by dgoulet＠torproject.org 11 Jun '19

11 Jun '19

commit 1978da4a5c9bcf3b90b5f4c6199f3486572898e4 Merge: 43c8b45 4907ce3 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 11 11:01:40 2019 -0400 Merge remote-tracking branch 'nickm/ticket29310' control-spec.txt | 8 ++++++++ 1 file changed, 8 insertions(+)

1 0