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

[tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.4.2
by teor＠torproject.org 07 Nov '19

07 Nov '19

commit 1f3bf10d3f4e59cbf858ff5ee6f398d990cc15c7 Merge: 8f6dc54e3 4d70e725d Author: teor <teor(a)torproject.org> Date: Thu Nov 7 10:51:22 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.4.2 changes/ticket32407 | 4 ++++ src/core/mainloop/mainloop.c | 4 ++++ src/lib/evloop/compat_libevent.c | 10 ++++++++++ src/lib/evloop/compat_libevent.h | 3 +++ 4 files changed, 21 insertions(+)

1 0

[tor/maint-0.4.2] Do not try to shut down the event loop when it is not initialized.
by teor＠torproject.org 07 Nov '19

07 Nov '19

commit 4d70e725d16abc2f85d54b91f50e75c37c765087 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 6 11:33:23 2019 -0500 Do not try to shut down the event loop when it is not initialized. Doing so caused us to crash in some unusual circumstances, such as using --verify-config to verify a configuration that failed during the options_act() stage. Fixes bug 32407; bugfix on 0.3.3.1-alpha. --- changes/ticket32407 | 4 ++++ src/core/mainloop/mainloop.c | 4 ++++ src/lib/evloop/compat_libevent.c | 10 ++++++++++ src/lib/evloop/compat_libevent.h | 3 +++ 4 files changed, 21 insertions(+) diff --git a/changes/ticket32407 b/changes/ticket32407 new file mode 100644 index 000000000..badb09abf --- /dev/null +++ b/changes/ticket32407 @@ -0,0 +1,4 @@ + o Minor bugfixes (crash): + - When running Tor with an option like --verify-config or --dump-config + that does not start the event loop, avoid crashing if we try to exit + early because of an error. Fixes bug 32407; bugfix on 0.3.3.1-alpha. diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 6e2b300fb..64df495ba 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -774,6 +774,10 @@ tor_shutdown_event_loop_and_exit(int exitcode) main_loop_should_exit = 1; main_loop_exit_value = exitcode; + if (! tor_libevent_is_initialized()) { + return; /* No event loop to shut down. */ + } + /* Die with an assertion failure in ten seconds, if for some reason we don't * exit normally. */ /* XXXX We should consider this code if it's never used. */ diff --git a/src/lib/evloop/compat_libevent.c b/src/lib/evloop/compat_libevent.c index 91eacb993..939d77f85 100644 --- a/src/lib/evloop/compat_libevent.c +++ b/src/lib/evloop/compat_libevent.c @@ -181,6 +181,16 @@ tor_libevent_initialize(tor_libevent_cfg *torcfg) event_get_version(), tor_libevent_get_method()); } +/** + * Return true iff the libevent module has been successfully initialized, + * and not subsequently shut down. + **/ +bool +tor_libevent_is_initialized(void) +{ + return the_event_base != NULL; +} + /** Return the current Libevent event base that we're set up to use. */ MOCK_IMPL(struct event_base *, tor_libevent_get_base, (void)) diff --git a/src/lib/evloop/compat_libevent.h b/src/lib/evloop/compat_libevent.h index afe887a01..92724c369 100644 --- a/src/lib/evloop/compat_libevent.h +++ b/src/lib/evloop/compat_libevent.h @@ -13,6 +13,8 @@ #include "lib/testsupport/testsupport.h" #include "lib/malloc/malloc.h" +#include <stdbool.h> + void configure_libevent_logging(void); void suppress_libevent_log_msg(const char *msg); @@ -68,6 +70,7 @@ typedef struct tor_libevent_cfg { } tor_libevent_cfg; void tor_libevent_initialize(tor_libevent_cfg *cfg); +bool tor_libevent_is_initialized(void); MOCK_DECL(struct event_base *, tor_libevent_get_base, (void)); const char *tor_libevent_get_method(void); void tor_check_libevent_header_compatibility(void);

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.4.2
by teor＠torproject.org 07 Nov '19

07 Nov '19

commit 1f3bf10d3f4e59cbf858ff5ee6f398d990cc15c7 Merge: 8f6dc54e3 4d70e725d Author: teor <teor(a)torproject.org> Date: Thu Nov 7 10:51:22 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.4.2 changes/ticket32407 | 4 ++++ src/core/mainloop/mainloop.c | 4 ++++ src/lib/evloop/compat_libevent.c | 10 ++++++++++ src/lib/evloop/compat_libevent.h | 3 +++ 4 files changed, 21 insertions(+)

1 0

[tor/master] Do not try to shut down the event loop when it is not initialized.
by teor＠torproject.org 07 Nov '19

07 Nov '19

commit 4d70e725d16abc2f85d54b91f50e75c37c765087 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 6 11:33:23 2019 -0500 Do not try to shut down the event loop when it is not initialized. Doing so caused us to crash in some unusual circumstances, such as using --verify-config to verify a configuration that failed during the options_act() stage. Fixes bug 32407; bugfix on 0.3.3.1-alpha. --- changes/ticket32407 | 4 ++++ src/core/mainloop/mainloop.c | 4 ++++ src/lib/evloop/compat_libevent.c | 10 ++++++++++ src/lib/evloop/compat_libevent.h | 3 +++ 4 files changed, 21 insertions(+) diff --git a/changes/ticket32407 b/changes/ticket32407 new file mode 100644 index 000000000..badb09abf --- /dev/null +++ b/changes/ticket32407 @@ -0,0 +1,4 @@ + o Minor bugfixes (crash): + - When running Tor with an option like --verify-config or --dump-config + that does not start the event loop, avoid crashing if we try to exit + early because of an error. Fixes bug 32407; bugfix on 0.3.3.1-alpha. diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 6e2b300fb..64df495ba 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -774,6 +774,10 @@ tor_shutdown_event_loop_and_exit(int exitcode) main_loop_should_exit = 1; main_loop_exit_value = exitcode; + if (! tor_libevent_is_initialized()) { + return; /* No event loop to shut down. */ + } + /* Die with an assertion failure in ten seconds, if for some reason we don't * exit normally. */ /* XXXX We should consider this code if it's never used. */ diff --git a/src/lib/evloop/compat_libevent.c b/src/lib/evloop/compat_libevent.c index 91eacb993..939d77f85 100644 --- a/src/lib/evloop/compat_libevent.c +++ b/src/lib/evloop/compat_libevent.c @@ -181,6 +181,16 @@ tor_libevent_initialize(tor_libevent_cfg *torcfg) event_get_version(), tor_libevent_get_method()); } +/** + * Return true iff the libevent module has been successfully initialized, + * and not subsequently shut down. + **/ +bool +tor_libevent_is_initialized(void) +{ + return the_event_base != NULL; +} + /** Return the current Libevent event base that we're set up to use. */ MOCK_IMPL(struct event_base *, tor_libevent_get_base, (void)) diff --git a/src/lib/evloop/compat_libevent.h b/src/lib/evloop/compat_libevent.h index afe887a01..92724c369 100644 --- a/src/lib/evloop/compat_libevent.h +++ b/src/lib/evloop/compat_libevent.h @@ -13,6 +13,8 @@ #include "lib/testsupport/testsupport.h" #include "lib/malloc/malloc.h" +#include <stdbool.h> + void configure_libevent_logging(void); void suppress_libevent_log_msg(const char *msg); @@ -68,6 +70,7 @@ typedef struct tor_libevent_cfg { } tor_libevent_cfg; void tor_libevent_initialize(tor_libevent_cfg *cfg); +bool tor_libevent_is_initialized(void); MOCK_DECL(struct event_base *, tor_libevent_get_base, (void)); const char *tor_libevent_get_method(void); void tor_check_libevent_header_compatibility(void);

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.4.2
by teor＠torproject.org 07 Nov '19

07 Nov '19

commit 1f3bf10d3f4e59cbf858ff5ee6f398d990cc15c7 Merge: 8f6dc54e3 4d70e725d Author: teor <teor(a)torproject.org> Date: Thu Nov 7 10:51:22 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.4.2 changes/ticket32407 | 4 ++++ src/core/mainloop/mainloop.c | 4 ++++ src/lib/evloop/compat_libevent.c | 10 ++++++++++ src/lib/evloop/compat_libevent.h | 3 +++ 4 files changed, 21 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.4.2'
by teor＠torproject.org 07 Nov '19

07 Nov '19

commit e466c84ed33a77aeddbc5f56f42e953bd5b49503 Merge: 10982d599 1f3bf10d3 Author: teor <teor(a)torproject.org> Date: Thu Nov 7 10:51:48 2019 +1000 Merge branch 'maint-0.4.2' changes/ticket32407 | 4 ++++ src/core/mainloop/mainloop.c | 4 ++++ src/lib/evloop/compat_libevent.c | 10 ++++++++++ src/lib/evloop/compat_libevent.h | 3 +++ 4 files changed, 21 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1512'
by teor＠torproject.org 07 Nov '19

07 Nov '19

commit 10982d59973a33da0d8a553b0d1ee6d1cb8d5a2c Merge: aebde7362 1ee17dc07 Author: teor <teor(a)torproject.org> Date: Thu Nov 7 10:35:50 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1512' src/app/config/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/master] OwningControllerFD should be immutable, not OwningControllerProcess.
by teor＠torproject.org 07 Nov '19

07 Nov '19

commit 1ee17dc07a4033546b5b4cfaedc3ace902ac8b20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 6 08:26:58 2019 -0500 OwningControllerFD should be immutable, not OwningControllerProcess. This is a mistake I made when marking options as immutable. Fixes bug 32399. Bug not in any released Tor. --- src/app/config/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 4a308a808..e223011fc 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -711,9 +711,9 @@ static const config_var_t option_vars_[] = { VAR_NODUMP("__HashedControlSessionPassword", LINELIST, HashedControlSessionPassword, NULL), - VAR_NODUMP_IMMUTABLE("__OwningControllerProcess",STRING, + VAR_NODUMP("__OwningControllerProcess",STRING, OwningControllerProcess, NULL), - VAR_NODUMP("__OwningControllerFD", UINT64, OwningControllerFD, + VAR_NODUMP_IMMUTABLE("__OwningControllerFD", UINT64, OwningControllerFD, UINT64_MAX_STRING), V(MinUptimeHidServDirectoryV2, INTERVAL, "96 hours"), V(TestingServerDownloadInitialDelay, CSV_INTERVAL, "0"),

1 0

[tor/master] Doxygen: set TYPEDEF_HIDES_STRUCT.
by nickm＠torproject.org 06 Nov '19

06 Nov '19

commit 36bceacdcdc6e7ed666cb4bbbf8cc76132f89bbd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 5 12:42:49 2019 -0500 Doxygen: set TYPEDEF_HIDES_STRUCT. This option tells doxygen to handle typedef struct foo_t foo_t by making foo_t and struct foo_t synonymous. This lets doxygen find documentation that it would otherwise miss: otherwise, if it sees documentation for "int func(foo_t *)" and a prototype for "int func(struct foo_t)", it will think that the prototype is undocumented. Part of #32386. --- Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doxyfile.in b/Doxyfile.in index be500bbfa..d0ff030ae 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -435,7 +435,7 @@ INLINE_SIMPLE_STRUCTS = NO # types are typedef'ed and only the typedef is referenced, never the tag name. # The default value is: NO. -TYPEDEF_HIDES_STRUCT = NO +TYPEDEF_HIDES_STRUCT = YES # The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This # cache is used to resolve symbols given their name and scope. Since this can be

1 0

[tor/master] Doxygen: set HIDE_SCOPE_NAMES.
by nickm＠torproject.org 06 Nov '19

06 Nov '19

commit de4ffebcf0a8dc281c603ef871af392b8324dc30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 5 12:43:38 2019 -0500 Doxygen: set HIDE_SCOPE_NAMES. This option tells doxygen to describe a member "member" of a struct "container" as "member", not "container::member". C doesn't use the :: syntax, so this should help us with readability. --- Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doxyfile.in b/Doxyfile.in index d0ff030ae..2e1a6d0c2 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -558,7 +558,7 @@ CASE_SENSE_NAMES = YES # scope will be hidden. # The default value is: NO. -HIDE_SCOPE_NAMES = NO +HIDE_SCOPE_NAMES = YES # If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will # append additional text to a page's title, such as Class Reference. If set to

1 0