tor-commits July 2019

tor-commits@lists.torproject.org

19 participants
1200 discussions

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

25 Jul '19

commit 044bb019b6959ce71e5f28ae537890a5860a3678 Merge: cfb15d513 af26cd610 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 25 10:27:41 2019 -0400 Merge branch 'maint-0.4.1' changes/bug31024 | 4 ++++ changes/bug31027 | 3 +++ src/core/or/circuitpadding.c | 15 ++++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-)

1 0

[tor/release-0.4.1] Remove dead code from circpad_machine_remove_token().
by dgoulet＠torproject.org 25 Jul '19

25 Jul '19

commit bd1ac408d854758cc40bde88cc5f71b46661b51c Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Jun 29 19:38:14 2019 +0300 Remove dead code from circpad_machine_remove_token(). --- changes/bug31027 | 3 +++ src/core/or/circuitpadding.c | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/changes/bug31027 b/changes/bug31027 new file mode 100644 index 000000000..dd3ce20b6 --- /dev/null +++ b/changes/bug31027 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Remove some dead code from circpad_machine_remove_token() to fix some + Coverity warnings (CID 1447298). Fixes bug 31027; bugfix on 0.4.1.1-alpha. \ No newline at end of file diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 0214cc421..626787da7 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -1083,8 +1083,11 @@ circpad_machine_remove_token(circpad_machine_runtime_t *mi) state = circpad_machine_current_state(mi); + /* If we are not in a padding state (like start or end), we're done */ + if (!state) + return; /* Don't remove any tokens if we're not doing token removal */ - if (!state || state->token_removal == CIRCPAD_TOKEN_REMOVAL_NONE) + if (state->token_removal == CIRCPAD_TOKEN_REMOVAL_NONE) return; current_time = monotime_absolute_usec(); @@ -1103,10 +1106,6 @@ circpad_machine_remove_token(circpad_machine_runtime_t *mi) timer_disable(mi->padding_timer); } - /* If we are not in a padding state (like start or end), we're done */ - if (!state) - return; - /* Perform the specified token removal strategy */ switch (state->token_removal) { case CIRCPAD_TOKEN_REMOVAL_CLOSEST_USEC:

1 0

[tor/master] practracker: Make it happing for circuitpadding.c
by dgoulet＠torproject.org 25 Jul '19

25 Jul '19

commit 57f955a38b5d547659cf8df194b4854afbf568f6 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 25 10:28:38 2019 -0400 practracker: Make it happing for circuitpadding.c Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- scripts/maint/practracker/exceptions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 66e9f7a0c..1a0136e8e 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -87,7 +87,7 @@ problem function-size /src/core/or/circuitlist.c:circuit_about_to_free() 120 problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 110 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 114 -problem file-size /src/core/or/circuitpadding.c 3001 +problem file-size /src/core/or/circuitpadding.c 3006 problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_relay_hide_intro_circuits() 104 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_client_hide_rend_circuits() 112

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by dgoulet＠torproject.org 25 Jul '19

25 Jul '19

commit 53ece8bd23f9f0d90c04d235c269cfdc3ecfb1e6 Merge: 530347972 af26cd610 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 25 10:27:41 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31024 | 4 ++++ changes/bug31027 | 3 +++ src/core/or/circuitpadding.c | 15 ++++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-)

1 0

[tor/release-0.4.1] Always check the retval of circpad_machine_current_state().
by dgoulet＠torproject.org 25 Jul '19

25 Jul '19

commit af26cd61015a2c127dbcf7e3db91da91adb415f9 Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Jun 29 19:46:43 2019 +0300 Always check the retval of circpad_machine_current_state(). --- changes/bug31024 | 4 ++++ src/core/or/circuitpadding.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/changes/bug31024 b/changes/bug31024 new file mode 100644 index 000000000..888fb2a26 --- /dev/null +++ b/changes/bug31024 @@ -0,0 +1,4 @@ + o Minor bugfixes (circuitpadding): + - Add two NULL checks in unreachable places to silence Coverity (CID 144729 + and 1447291) and better future proof ourselves. Fixes bug 31024; bugfix + on 0.4.1.1-alpha. \ No newline at end of file diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 626787da7..c4670bbc2 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -450,6 +450,9 @@ circpad_is_token_removal_supported(circpad_machine_runtime_t *mi) /* Machines that do want token removal are less sensitive to performance. * Let's spend some time to check that our state is consistent and sane */ const circpad_state_t *state = circpad_machine_current_state(mi); + if (BUG(!state)) { + return 1; + } tor_assert_nonfatal(state->token_removal != CIRCPAD_TOKEN_REMOVAL_NONE); tor_assert_nonfatal(state->histogram_len == mi->histogram_len); tor_assert_nonfatal(mi->histogram_len != 0); @@ -1667,6 +1670,9 @@ circpad_estimate_circ_rtt_on_received(circuit_t *circ, } } else { const circpad_state_t *state = circpad_machine_current_state(mi); + if (BUG(!state)) { + return; + } /* Since monotime is unpredictably expensive, only update this field * if rtt estimates are needed. Otherwise, stop the rtt update. */

1 0

[tor/maint-0.4.1] Use a 64-bit mask for log domains, and fix a conflict
by dgoulet＠torproject.org 25 Jul '19

25 Jul '19

commit 09c692e72b56e08668ae5f42416741ebd6edc404 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 8 13:32:45 2019 -0400 Use a 64-bit mask for log domains, and fix a conflict When we added LD_MESG, we created a conflict with the LD_NO_MOCK flag. We now need 64 bits for log domains in order to fix this issue. Fixes bug 31080; bugfix on 0.4.1.1-alpha. --- changes/bug31080_041 | 4 +++ src/lib/err/backtrace.c | 4 +-- src/lib/err/backtrace.h | 5 ++-- src/lib/log/log.h | 68 ++++++++++++++++++++++++------------------------- 4 files changed, 43 insertions(+), 38 deletions(-) diff --git a/changes/bug31080_041 b/changes/bug31080_041 new file mode 100644 index 000000000..1fe9ec508 --- /dev/null +++ b/changes/bug31080_041 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Fix a conflict between the flag used for messaging-domain + log messages, and the LD_NO_MOCK testing flag. Fixes bug 31080; + bugfix on 0.4.1.1-alpha. diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index 1d1b3bcfa..f5fa7ec29 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -115,7 +115,7 @@ clean_backtrace(void **stack, size_t depth, const ucontext_t *ctx) * that with a backtrace log. Send messages via the tor_log function at * logger". */ void -log_backtrace_impl(int severity, int domain, const char *msg, +log_backtrace_impl(int severity, uint64_t domain, const char *msg, tor_log_fn logger) { size_t depth; @@ -240,7 +240,7 @@ remove_bt_handler(void) #ifdef NO_BACKTRACE_IMPL void -log_backtrace_impl(int severity, int domain, const char *msg, +log_backtrace_impl(int severity, uint64_t domain, const char *msg, tor_log_fn logger) { logger(severity, domain, "%s. (Stack trace not available)", msg); diff --git a/src/lib/err/backtrace.h b/src/lib/err/backtrace.h index 9b313261e..ba3049ed1 100644 --- a/src/lib/err/backtrace.h +++ b/src/lib/err/backtrace.h @@ -12,11 +12,12 @@ #include "orconfig.h" #include "lib/cc/compat_compiler.h" +#include "lib/cc/torint.h" -typedef void (*tor_log_fn)(int, unsigned, const char *fmt, ...) +typedef void (*tor_log_fn)(int, uint64_t, const char *fmt, ...) CHECK_PRINTF(3,4); -void log_backtrace_impl(int severity, int domain, const char *msg, +void log_backtrace_impl(int severity, uint64_t domain, const char *msg, tor_log_fn logger); int configure_backtrace_handler(const char *tor_version); void clean_up_backtrace_handler(void); diff --git a/src/lib/log/log.h b/src/lib/log/log.h index bd606ce90..801bafa96 100644 --- a/src/lib/log/log.h +++ b/src/lib/log/log.h @@ -56,82 +56,82 @@ /* Logging domains */ /** Catch-all for miscellaneous events and fatal errors. */ -#define LD_GENERAL (1u<<0) +#define LD_GENERAL (UINT64_C(1)<<0) /** The cryptography subsystem. */ -#define LD_CRYPTO (1u<<1) +#define LD_CRYPTO (UINT64_C(1)<<1) /** Networking. */ -#define LD_NET (1u<<2) +#define LD_NET (UINT64_C(1)<<2) /** Parsing and acting on our configuration. */ -#define LD_CONFIG (1u<<3) +#define LD_CONFIG (UINT64_C(1)<<3) /** Reading and writing from the filesystem. */ -#define LD_FS (1u<<4) +#define LD_FS (UINT64_C(1)<<4) /** Other servers' (non)compliance with the Tor protocol. */ -#define LD_PROTOCOL (1u<<5) +#define LD_PROTOCOL (UINT64_C(1)<<5) /** Memory management. */ -#define LD_MM (1u<<6) +#define LD_MM (UINT64_C(1)<<6) /** HTTP implementation. */ -#define LD_HTTP (1u<<7) +#define LD_HTTP (UINT64_C(1)<<7) /** Application (socks) requests. */ -#define LD_APP (1u<<8) +#define LD_APP (UINT64_C(1)<<8) /** Communication via the controller protocol. */ -#define LD_CONTROL (1u<<9) +#define LD_CONTROL (UINT64_C(1)<<9) /** Building, using, and managing circuits. */ -#define LD_CIRC (1u<<10) +#define LD_CIRC (UINT64_C(1)<<10) /** Hidden services. */ -#define LD_REND (1u<<11) +#define LD_REND (UINT64_C(1)<<11) /** Internal errors in this Tor process. */ -#define LD_BUG (1u<<12) +#define LD_BUG (UINT64_C(1)<<12) /** Learning and using information about Tor servers. */ -#define LD_DIR (1u<<13) +#define LD_DIR (UINT64_C(1)<<13) /** Learning and using information about Tor servers. */ -#define LD_DIRSERV (1u<<14) +#define LD_DIRSERV (UINT64_C(1)<<14) /** Onion routing protocol. */ -#define LD_OR (1u<<15) +#define LD_OR (UINT64_C(1)<<15) /** Generic edge-connection functionality. */ -#define LD_EDGE (1u<<16) +#define LD_EDGE (UINT64_C(1)<<16) #define LD_EXIT LD_EDGE /** Bandwidth accounting. */ -#define LD_ACCT (1u<<17) +#define LD_ACCT (UINT64_C(1)<<17) /** Router history */ -#define LD_HIST (1u<<18) +#define LD_HIST (UINT64_C(1)<<18) /** OR handshaking */ -#define LD_HANDSHAKE (1u<<19) +#define LD_HANDSHAKE (UINT64_C(1)<<19) /** Heartbeat messages */ -#define LD_HEARTBEAT (1u<<20) +#define LD_HEARTBEAT (UINT64_C(1)<<20) /** Abstract channel_t code */ -#define LD_CHANNEL (1u<<21) +#define LD_CHANNEL (UINT64_C(1)<<21) /** Scheduler */ -#define LD_SCHED (1u<<22) +#define LD_SCHED (UINT64_C(1)<<22) /** Guard nodes */ -#define LD_GUARD (1u<<23) +#define LD_GUARD (UINT64_C(1)<<23) /** Generation and application of consensus diffs. */ -#define LD_CONSDIFF (1u<<24) +#define LD_CONSDIFF (UINT64_C(1)<<24) /** Denial of Service mitigation. */ -#define LD_DOS (1u<<25) +#define LD_DOS (UINT64_C(1)<<25) /** Processes */ -#define LD_PROCESS (1u<<26) +#define LD_PROCESS (UINT64_C(1)<<26) /** Pluggable Transports. */ -#define LD_PT (1u<<27) +#define LD_PT (UINT64_C(1)<<27) /** Bootstrap tracker. */ -#define LD_BTRACK (1u<<28) +#define LD_BTRACK (UINT64_C(1)<<28) /** Message-passing backend. */ -#define LD_MESG (1u<<29) +#define LD_MESG (UINT64_C(1)<<29) #define N_LOGGING_DOMAINS 30 #ifdef TOR_UNIT_TESTS /** This log message should not be intercepted by mock_saving_logv */ -#define LD_NO_MOCK (1u<<29) +#define LD_NO_MOCK (UINT64_C(1)<<61) #endif /** This log message is not safe to send to a callback-based logger * immediately. Used as a flag, not a log domain. */ -#define LD_NOCB (1u<<31) +#define LD_NOCB (UINT64_C(1)<<62) /** This log message should not include a function name, even if it otherwise * would. Used as a flag, not a log domain. */ -#define LD_NOFUNCNAME (1u<<30) +#define LD_NOFUNCNAME (UINT64_C(1)<<63) /** Mask of zero or more log domains, OR'd together. */ -typedef uint32_t log_domain_mask_t; +typedef uint64_t log_domain_mask_t; /** Configures which severities are logged for each logging domain for a given * log target. */

1 0

[tor/maint-0.4.1] Move declaration of LD_NO_MESG to make conflict more apparent.
by dgoulet＠torproject.org 25 Jul '19

25 Jul '19

commit d972f29d8df742d757eea9078fedaeed74cd0921 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 8 13:00:31 2019 -0400 Move declaration of LD_NO_MESG to make conflict more apparent. --- src/lib/log/log.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/log/log.h b/src/lib/log/log.h index 3db216958..bd606ce90 100644 --- a/src/lib/log/log.h +++ b/src/lib/log/log.h @@ -118,6 +118,11 @@ #define LD_MESG (1u<<29) #define N_LOGGING_DOMAINS 30 +#ifdef TOR_UNIT_TESTS +/** This log message should not be intercepted by mock_saving_logv */ +#define LD_NO_MOCK (1u<<29) +#endif + /** This log message is not safe to send to a callback-based logger * immediately. Used as a flag, not a log domain. */ #define LD_NOCB (1u<<31) @@ -125,11 +130,6 @@ * would. Used as a flag, not a log domain. */ #define LD_NOFUNCNAME (1u<<30) -#ifdef TOR_UNIT_TESTS -/** This log message should not be intercepted by mock_saving_logv */ -#define LD_NO_MOCK (1u<<29) -#endif - /** Mask of zero or more log domains, OR'd together. */ typedef uint32_t log_domain_mask_t;

1 0

[tor/maint-0.4.1] Adjust tor_log.rs for 64-bit log domains.
by dgoulet＠torproject.org 25 Jul '19

25 Jul '19

commit f682de609b456ccfdb19aef1a1afa8c0873ceb51 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 19 10:07:32 2019 -0400 Adjust tor_log.rs for 64-bit log domains. --- src/rust/tor_log/tor_log.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rust/tor_log/tor_log.rs b/src/rust/tor_log/tor_log.rs index 98fccba5a..bbaf97129 100644 --- a/src/rust/tor_log/tor_log.rs +++ b/src/rust/tor_log/tor_log.rs @@ -99,14 +99,14 @@ pub mod log { /// Domain log types. These mirror definitions in src/lib/log/log.h /// C_RUST_COUPLED: src/lib/log/log.c, log severity types extern "C" { - static LD_NET_: u32; - static LD_GENERAL_: u32; + static LD_NET_: u64; + static LD_GENERAL_: u64; } /// Translate Rust defintions of log domain levels to C. This exposes a 1:1 /// mapping between types. #[inline] - pub unsafe fn translate_domain(domain: LogDomain) -> u32 { + pub unsafe fn translate_domain(domain: LogDomain) -> u64 { match domain { LogDomain::Net => LD_NET_, LogDomain::General => LD_GENERAL_, @@ -128,7 +128,7 @@ pub mod log { extern "C" { pub fn tor_log_string( severity: c_int, - domain: u32, + domain: u64, function: *const c_char, string: *const c_char, );

1 0

[tor/maint-0.4.1] Add a compile-time assertion to prevent a recurrence of 31080.
by dgoulet＠torproject.org 25 Jul '19

25 Jul '19

commit 4512578e49b187075d4e8b4d07a0c921a15d5135 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 8 13:41:35 2019 -0400 Add a compile-time assertion to prevent a recurrence of 31080. --- src/lib/log/log.c | 2 ++ src/lib/log/log.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/lib/log/log.c b/src/lib/log/log.c index c68f335da..756eb2a97 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -1275,6 +1275,8 @@ static const char *domain_list[] = { CTASSERT(ARRAY_LENGTH(domain_list) == N_LOGGING_DOMAINS + 1); +CTASSERT((UINT64_C(1)<<(N_LOGGING_DOMAINS-1)) < LOWEST_RESERVED_LD_FLAG_); + /** Return a bitmask for the log domain for which <b>domain</b> is the name, * or 0 if there is no such name. */ static log_domain_mask_t diff --git a/src/lib/log/log.h b/src/lib/log/log.h index 801bafa96..88e4ad8d6 100644 --- a/src/lib/log/log.h +++ b/src/lib/log/log.h @@ -118,6 +118,8 @@ #define LD_MESG (UINT64_C(1)<<29) #define N_LOGGING_DOMAINS 30 +/** First bit that is reserved in log_domain_mask_t for non-domain flags. */ +#define LOWEST_RESERVED_LD_FLAG_ (UINT64_C(1)<<61) #ifdef TOR_UNIT_TESTS /** This log message should not be intercepted by mock_saving_logv */ #define LD_NO_MOCK (UINT64_C(1)<<61)

1 0

[tor/maint-0.4.1] Adjust log callback type to use log_domain_mask_t
by dgoulet＠torproject.org 25 Jul '19

25 Jul '19

commit 2e55fa9587ffd8e988229fe127881289d9271c32 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 8 14:11:02 2019 -0400 Adjust log callback type to use log_domain_mask_t --- src/feature/control/control_events.c | 2 +- src/feature/control/control_events.h | 3 ++- src/lib/log/log.h | 3 ++- src/test/test_logging.c | 2 +- src/test/test_options.c | 2 +- src/test/testing_common.c | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index e596a8aee..9e0966ca5 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -1287,7 +1287,7 @@ enable_control_logging(void) /** We got a log message: tell any interested control connections. */ void -control_event_logmsg(int severity, uint32_t domain, const char *msg) +control_event_logmsg(int severity, log_domain_mask_t domain, const char *msg) { int event; diff --git a/src/feature/control/control_events.h b/src/feature/control/control_events.h index 0bdbb9cfd..34986fdb8 100644 --- a/src/feature/control/control_events.h +++ b/src/feature/control/control_events.h @@ -128,7 +128,8 @@ int control_event_circ_bandwidth_used_for_circ(origin_circuit_t *ocirc); int control_event_conn_bandwidth(connection_t *conn); int control_event_conn_bandwidth_used(void); int control_event_circuit_cell_stats(void); -void control_event_logmsg(int severity, uint32_t domain, const char *msg); +void control_event_logmsg(int severity, log_domain_mask_t domain, + const char *msg); void control_event_logmsg_pending(void); int control_event_descriptors_changed(smartlist_t *routers); int control_event_address_mapped(const char *from, const char *to, diff --git a/src/lib/log/log.h b/src/lib/log/log.h index 88e4ad8d6..301c7d571 100644 --- a/src/lib/log/log.h +++ b/src/lib/log/log.h @@ -144,7 +144,8 @@ typedef struct log_severity_list_t { } log_severity_list_t; /** Callback type used for add_callback_log. */ -typedef void (*log_callback)(int severity, uint32_t domain, const char *msg); +typedef void (*log_callback)(int severity, log_domain_mask_t domain, + const char *msg); void init_logging(int disable_startup_queue); int parse_log_level(const char *level); diff --git a/src/test/test_logging.c b/src/test/test_logging.c index 6416e98a4..bb7018fe1 100644 --- a/src/test/test_logging.c +++ b/src/test/test_logging.c @@ -15,7 +15,7 @@ #endif static void -dummy_cb_fn(int severity, uint32_t domain, const char *msg) +dummy_cb_fn(int severity, log_domain_mask_t domain, const char *msg) { (void)severity; (void)domain; (void)msg; } diff --git a/src/test/test_options.c b/src/test/test_options.c index 396be6b18..d2f0c1121 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -38,7 +38,7 @@ typedef struct { static smartlist_t *messages = NULL; static void -log_cback(int severity, uint32_t domain, const char *msg) +log_cback(int severity, log_domain_mask_t domain, const char *msg) { logmsg_t *x = tor_malloc(sizeof(*x)); x->severity = severity; diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 1c2a2e896..ad22898ce 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -243,7 +243,7 @@ tinytest_postfork(void) } static void -log_callback_failure(int severity, uint32_t domain, const char *msg) +log_callback_failure(int severity, log_domain_mask_t domain, const char *msg) { (void)msg; if (severity == LOG_ERR || (domain & LD_BUG)) {

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2019