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

[tor/release-0.4.3] Merge branch 'bug33087_042' into bug33087_043
by nickm＠torproject.org 09 Apr '20

09 Apr '20

commit 4f533ed28b831eb794f562dac9add1dbf37f6335 Merge: 8a23393ed b6d1f99cb Author: teor <teor(a)torproject.org> Date: Thu Feb 13 00:02:11 2020 +1000 Merge branch 'bug33087_042' into bug33087_043 "ours" merge, because the 0.4.2 backport deletes the close functions. But the 0.4.3 bug fix replaces them with fsync() where available.

1 0

[tor/release-0.4.3] log: Stop duplicating error file fds
by nickm＠torproject.org 09 Apr '20

09 Apr '20

commit 8a23393eda00c7b7448b4d84157c5d06ba40c01c Author: teor <teor(a)torproject.org> Date: Wed Feb 12 13:11:57 2020 +1000 log: Stop duplicating error file fds Since we're not closing these fds, they don't need to be duplicated any more. Cleanup after 33087. --- src/lib/log/log.c | 41 ++++++++++++----------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/src/lib/log/log.c b/src/lib/log/log.c index 4813a4fae..cfb8f5b42 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -665,21 +665,15 @@ tor_log_update_sigsafe_err_fds(void) const logfile_t *lf; int found_real_stderr = 0; - /* log_fds and err_fds contain matching entries: log_fds are the fds used by - * the log module, and err_fds are the fds used by the err module. - * For stdio logs, the log_fd and err_fd values are identical. - * For file logs, the err_fd is a dup() of the log_fd. - * Both the log and err modules flush these fds on shutdown. - */ - int log_fds[TOR_SIGSAFE_LOG_MAX_FDS]; - int err_fds[TOR_SIGSAFE_LOG_MAX_FDS]; + /* The fds are the file descriptors of tor's stdout, stderr, and file + * logs. The log and err modules flush these fds during their shutdowns. */ + int fds[TOR_SIGSAFE_LOG_MAX_FDS]; int n_fds; LOCK_LOGS(); /* Reserve the first one for stderr. This is safe because when we daemonize, - * we dup2 /dev/null to stderr. - * For stderr, log_fds and err_fds are the same. */ - log_fds[0] = err_fds[0] = STDERR_FILENO; + * we dup2 /dev/null to stderr. */ + fds[0] = STDERR_FILENO; n_fds = 1; for (lf = logfiles; lf; lf = lf->next) { @@ -694,21 +688,11 @@ tor_log_update_sigsafe_err_fds(void) (LD_BUG|LD_GENERAL)) { if (lf->fd == STDERR_FILENO) found_real_stderr = 1; - /* Avoid duplicates by checking the log module fd against log_fds */ - if (int_array_contains(log_fds, n_fds, lf->fd)) + /* Avoid duplicates by checking the log module fd against fds */ + if (int_array_contains(fds, n_fds, lf->fd)) continue; - /* Update log_fds using the log module's fd */ - log_fds[n_fds] = lf->fd; - if (lf->needs_close) { - /* File log fds are duplicated, because close_log() closes the log - * module's fd, and tor_log_flush_sigsafe_err_fds() closes the err - * module's fd. Both refer to the same file. */ - err_fds[n_fds] = dup(lf->fd); - } else { - /* stdio log fds are not closed by the log module. - * tor_log_flush_sigsafe_err_fds() closes stdio logs. */ - err_fds[n_fds] = lf->fd; - } + /* Update fds using the log module's fd */ + fds[n_fds] = lf->fd; n_fds++; if (n_fds == TOR_SIGSAFE_LOG_MAX_FDS) break; @@ -716,20 +700,19 @@ tor_log_update_sigsafe_err_fds(void) } if (!found_real_stderr && - int_array_contains(log_fds, n_fds, STDOUT_FILENO)) { + int_array_contains(fds, n_fds, STDOUT_FILENO)) { /* Don't use a virtual stderr when we're also logging to stdout. * If we reached max_fds logs, we'll now have (max_fds - 1) logs. * That's ok, max_fds is large enough that most tor instances don't exceed * it. */ raw_assert(n_fds >= 2); /* Don't tor_assert inside log fns */ --n_fds; - log_fds[0] = log_fds[n_fds]; - err_fds[0] = err_fds[n_fds]; + fds[0] = fds[n_fds]; } UNLOCK_LOGS(); - tor_log_set_sigsafe_err_fds(err_fds, n_fds); + tor_log_set_sigsafe_err_fds(fds, n_fds); } /** Add to out a copy of every currently configured log file name. Used

1 0

[tor/release-0.4.3] Run "make autostyle"
by nickm＠torproject.org 09 Apr '20

09 Apr '20

commit e849881d3ad80e46bc4297d2cf9651f3f7d039cc Author: teor <teor(a)torproject.org> Date: Thu Feb 13 09:28:21 2020 +1000 Run "make autostyle" But only take the changes that were caused by the rest of the 33087 branch. Part of 33087. --- src/lib/err/torerr.c | 2 +- src/lib/log/log.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/err/torerr.c b/src/lib/err/torerr.c index c2dd862e1..2de75c0be 100644 --- a/src/lib/err/torerr.c +++ b/src/lib/err/torerr.c @@ -171,7 +171,7 @@ tor_log_flush_sigsafe_err_fds(void) * take any other action, if fsync() fails. */ (void)fsync(fds[i]); } -#endif +#endif /* defined(HAVE_FSYNC) */ } /** diff --git a/src/lib/log/log.c b/src/lib/log/log.c index cfb8f5b42..eb8151574 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -844,7 +844,7 @@ logs_flush_sigsafe(void) (void)fsync(victim->fd); } } -#endif +#endif /* defined(HAVE_FSYNC) */ } /** Remove and free the log entry victim from the linked-list

1 0

[tor/release-0.4.3] Add fsync to list of syscalls permitted by sandbox
by nickm＠torproject.org 09 Apr '20

09 Apr '20

commit c4da0a5094e21241db8ce0d8b12c2e4272fa49ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 9 08:33:11 2020 -0400 Add fsync to list of syscalls permitted by sandbox (Our fix for 33087 requires this, I believe.) --- src/lib/sandbox/sandbox.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index 1d2c40c75..626a4dc5a 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -166,6 +166,7 @@ static int filter_nopar_gen[] = { #ifdef __NR_fstat64 SCMP_SYS(fstat64), #endif + SCMP_SYS(fsync), SCMP_SYS(futex), SCMP_SYS(getdents), SCMP_SYS(getdents64),

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by nickm＠torproject.org 09 Apr '20

09 Apr '20

commit 7aa1e9b61b07324ff370ef0875d0d4a3bb821520 Merge: c502ce076 c4da0a509 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 9 08:33:36 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug33087 | 7 ++++++ configure.ac | 1 + src/lib/err/torerr.c | 26 ++++++++++---------- src/lib/err/torerr.h | 2 +- src/lib/err/torerr_sys.c | 6 ++--- src/lib/log/log.c | 60 +++++++++++++++++------------------------------ src/lib/log/log.h | 2 +- src/lib/log/util_bug.c | 2 +- src/lib/sandbox/sandbox.c | 1 + 9 files changed, 47 insertions(+), 60 deletions(-)

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.4.1' into bug33087_041
by nickm＠torproject.org 09 Apr '20

09 Apr '20

commit 2c0dfb093e2afb2bd5a06c2f5441d55237729de4 Merge: c8242e4c0 5298113da Author: teor <teor(a)torproject.org> Date: Wed Feb 12 19:19:38 2020 +1000 Merge branch 'maint-0.4.1' into bug33087_041 .travis.yml | 2 -- changes/bug32753 | 3 +++ changes/ticket33075 | 4 ++++ src/app/config/config.c | 2 +- src/feature/relay/router.c | 15 ++++++++++----- src/test/test_config.c | 22 +++++++++++++++++++--- 6 files changed, 37 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.4.3] err/log: Stop closing stderr and stdout during shutdown
by nickm＠torproject.org 09 Apr '20

09 Apr '20

commit c8242e4c0ae838121ed00d5a38cf0dae052e9d13 Author: teor <teor(a)torproject.org> Date: Wed Feb 12 12:47:15 2020 +1000 err/log: Stop closing stderr and stdout during shutdown Closing these file descriptors can hide sanitiser logs. Fixes bug 33087; bugfix on 0.4.1.6. --- changes/bug33087 | 4 ++++ src/lib/err/torerr.c | 31 ++----------------------------- src/lib/err/torerr.h | 1 - src/lib/err/torerr_sys.c | 5 +---- src/lib/log/log.c | 36 +++--------------------------------- src/lib/log/log.h | 1 - src/lib/log/util_bug.c | 4 +--- 7 files changed, 11 insertions(+), 71 deletions(-) diff --git a/changes/bug33087 b/changes/bug33087 new file mode 100644 index 000000000..7acf72a83 --- /dev/null +++ b/changes/bug33087 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Stop closing stderr and stdout during shutdown. Closing these file + descriptors can hide sanitiser logs. + Fixes bug 33087; bugfix on 0.4.1.6. diff --git a/src/lib/err/torerr.c b/src/lib/err/torerr.c index b7e32a3e2..5095c28ba 100644 --- a/src/lib/err/torerr.c +++ b/src/lib/err/torerr.c @@ -151,32 +151,6 @@ tor_log_reset_sigsafe_err_fds(void) } /** - * Close the list of fds that get errors from inside a signal handler or - * other emergency condition. These fds are shared with the logging code: - * closing them flushes the log buffers, and prevents any further logging. - * - * This function closes stderr, so it should only be called immediately before - * process shutdown. - */ -void -tor_log_close_sigsafe_err_fds(void) -{ - int n_fds, i; - const int *fds = NULL; - - n_fds = tor_log_get_sigsafe_err_fds(&fds); - for (i = 0; i < n_fds; ++i) { - /* tor_log_close_sigsafe_err_fds_on_error() is called on error and on - * shutdown, so we can't log or take any useful action if close() - * fails. */ - (void)close(fds[i]); - } - - /* Don't even try logging, we've closed all the log fds. */ - tor_log_set_sigsafe_err_fds(NULL, 0); -} - -/** * Set the granularity (in ms) to use when reporting fatal errors outside * the logging system. */ @@ -217,13 +191,12 @@ tor_raw_assertion_failed_msg_(const char *file, int line, const char *expr, /** * Call the abort() function to kill the current process with a fatal - * error. But first, close the raw error file descriptors, so error messages - * are written before process termination. + * error. This is a separate function, so that log users don't have to include + * the header for abort(). **/ void tor_raw_abort_(void) { - tor_log_close_sigsafe_err_fds(); abort(); } diff --git a/src/lib/err/torerr.h b/src/lib/err/torerr.h index 0e839cb1b..a1822d9c9 100644 --- a/src/lib/err/torerr.h +++ b/src/lib/err/torerr.h @@ -40,7 +40,6 @@ void tor_log_err_sigsafe(const char *m, ...); int tor_log_get_sigsafe_err_fds(const int **out); void tor_log_set_sigsafe_err_fds(const int *fds, int n); void tor_log_reset_sigsafe_err_fds(void); -void tor_log_close_sigsafe_err_fds(void); void tor_log_sigsafe_err_set_granularity(int ms); void tor_raw_abort_(void) ATTR_NORETURN; diff --git a/src/lib/err/torerr_sys.c b/src/lib/err/torerr_sys.c index a14c46f94..6a51a45a4 100644 --- a/src/lib/err/torerr_sys.c +++ b/src/lib/err/torerr_sys.c @@ -27,11 +27,8 @@ subsys_torerr_initialize(void) static void subsys_torerr_shutdown(void) { - /* Stop handling signals with backtraces, then close the logs. */ + /* Stop handling signals with backtraces. */ clean_up_backtrace_handler(); - /* We can't log any log messages after this point: we've closed all the log - * fds, including stdio. */ - tor_log_close_sigsafe_err_fds(); } const subsys_fns_t sys_torerr = { diff --git a/src/lib/log/log.c b/src/lib/log/log.c index ec7c2fa24..69624e9ca 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -668,12 +668,8 @@ tor_log_update_sigsafe_err_fds(void) /* log_fds and err_fds contain matching entries: log_fds are the fds used by * the log module, and err_fds are the fds used by the err module. - * For stdio logs, the log_fd and err_fd values are identical, - * and the err module closes the fd on shutdown. - * For file logs, the err_fd is a dup() of the log_fd, - * and the log and err modules both close their respective fds on shutdown. - * (Once all fds representing a file are closed, the underlying file is - * closed.) + * For stdio logs, the log_fd and err_fd values are identical. + * For file logs, the err_fd is a dup() of the log_fd. */ int log_fds[TOR_SIGSAFE_LOG_MAX_FDS]; int err_fds[TOR_SIGSAFE_LOG_MAX_FDS]; @@ -704,12 +700,10 @@ tor_log_update_sigsafe_err_fds(void) log_fds[n_fds] = lf->fd; if (lf->needs_close) { /* File log fds are duplicated, because close_log() closes the log - * module's fd, and tor_log_close_sigsafe_err_fds() closes the err * module's fd. Both refer to the same file. */ err_fds[n_fds] = dup(lf->fd); } else { - /* stdio log fds are not closed by the log module. - * tor_log_close_sigsafe_err_fds() closes stdio logs. */ + /* stdio log fds are not closed by the log module. */ err_fds[n_fds] = lf->fd; } n_fds++; @@ -838,30 +832,6 @@ logs_free_all(void) * log mutex. */ } -/** Close signal-safe log files. - * Closing the log files makes the process and OS flush log buffers. - * - * This function is safe to call from a signal handler. It should only be - * called when shutting down the log or err modules. It is currenly called - * by the err module, when terminating the process on an abnormal condition. - */ -void -logs_close_sigsafe(void) -{ - logfile_t *victim, *next; - /* We can't LOCK_LOGS() in a signal handler, because it may call - * signal-unsafe functions. And we can't deallocate memory, either. */ - next = logfiles; - logfiles = NULL; - while (next) { - victim = next; - next = next->next; - if (victim->needs_close) { - close_log_sigsafe(victim); - } - } -} - /** Remove and free the log entry victim from the linked-list * logfiles (it is probably present, but it might not be due to thread * racing issues). After this function is called, the caller shouldn't diff --git a/src/lib/log/log.h b/src/lib/log/log.h index 4291418eb..c4a27782c 100644 --- a/src/lib/log/log.h +++ b/src/lib/log/log.h @@ -173,7 +173,6 @@ void logs_set_domain_logging(int enabled); int get_min_log_level(void); void switch_logs_debug(void); void logs_free_all(void); -void logs_close_sigsafe(void); void add_temp_log(int min_severity); void close_temp_logs(void); void rollback_log_changes(void); diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c index 0e99be35a..640fe050e 100644 --- a/src/lib/log/util_bug.c +++ b/src/lib/log/util_bug.c @@ -163,8 +163,7 @@ tor_bug_occurred_(const char *fname, unsigned int line, /** * Call the tor_raw_abort_() function to close raw logs, then kill the current - * process with a fatal error. But first, close the file-based log file - * descriptors, so error messages are written before process termination. + * process with a fatal error. * * (This is a separate function so that we declare it in util_bug.h without * including torerr.h in all the users of util_bug.h) @@ -172,7 +171,6 @@ tor_bug_occurred_(const char *fname, unsigned int line, void tor_abort_(void) { - logs_close_sigsafe(); tor_raw_abort_(); }

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 09 Apr '20

09 Apr '20

commit 819348f1c46e3de2674d97c1e487711d55d3a88e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 9 12:23:39 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+pl.po | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/contents+pl.po b/contents+pl.po index dcb915b4fe..9c580a1d56 100644 --- a/contents+pl.po +++ b/contents+pl.po @@ -11,8 +11,8 @@ # Michał Nowak <nowak1michal(a)gmail.com>, 2019 # erinm, 2020 # Robert R <partisan(a)o2.pl>, 2020 -# Waldemar Stoczkowski, 2020 # Bartosz Duszel <bartosz.duszel(a)protonmail.com>, 2020 +# Waldemar Stoczkowski, 2020 # msgid "" msgstr "" @@ -20,7 +20,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-02-24 13:39+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Bartosz Duszel <bartosz.duszel(a)protonmail.com>, 2020\n" +"Last-Translator: Waldemar Stoczkowski, 2020\n" "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -240,6 +240,10 @@ msgid "" "add more. Want to help us translate? [See " "here](https://community.torproject.org/localization/)" msgstr "" +"Chcemy, aby każdy mógł cieszyć się przeglądarką Tor w swoim własnym języku. " +"Przeglądarka Tor jest teraz dostępna w 32 różnych językach i pracujemy nad " +"dodaniem kolejnych. Chcesz nam pomóc w tłumaczeniu? [Zobacz tutaj] " +"(https://community.torproject.org/localization/)" #: https//www.torproject.org/download/tor/ #: (content/download/tor/contents+en.lrpage.title) @@ -254,7 +258,7 @@ msgstr "Nagrody Cy Pres" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid "### Cy Pres Awards – Consumer Privacy and Privacy Online" -msgstr "" +msgstr "### Cy Pres Awards - Prywatność konsumentów i prywatność online" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -272,7 +276,7 @@ msgstr "" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid "#### About the Tor Project" -msgstr "" +msgstr "#### O Projekcie Tor" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -280,22 +284,26 @@ msgid "" "The Tor Project is a U.S.-based 501(c)3 nonprofit founded in 2006 with the " "mission of advancing human rights and freedoms by:" msgstr "" +"Projekt Tor to amerykańska organizacja non-profit 501 (c) 3 założona w 2006 " +"roku z misją promowania praw i wolności człowieka przez:" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid "" "- Creating and deploying free and open anonymity and privacy technologies," msgstr "" +"- Tworzenie i wdrażanie bezpłatnych i otwartych technologii anonimowości i " +"prywatności," #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid "- Supporting their unrestricted availability and use, and" -msgstr "" +msgstr "- Wspieranie ich nieograniczonej dostępności i użytkowania, oraz" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid "- Furthering their scientific and popular understanding." -msgstr "" +msgstr "- Pogłębianie wiedzy naukowej i popularnej." #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -304,6 +312,9 @@ msgid "" " the most popular and widely used free, open source privacy technologies: " "Tor Browser and the Tor network." msgstr "" +"Projekt Tor i otaczająca go społeczność opracowują i rozpowszechniają " +"niektóre z najpopularniejszych i najczęściej używanych bezpłatnych " +"technologii prywatności typu open source: Przeglądarka Tor i sieć Tor." #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -912,7 +923,7 @@ msgstr "" #: templates/contact.html:11 msgid "Get in touch with other translators" -msgstr "" +msgstr "Skontaktuj się z innymi tłumaczami" #: templates/contact.html:12 msgid "Watch or join publicly logged team meetings." @@ -1069,15 +1080,15 @@ msgstr "Windows" #: templates/download-languages.html:13 msgid "macOS" -msgstr "" +msgstr "macOS" #: templates/download-languages.html:14 templates/download-options.html:14 msgid "GNU/Linux" -msgstr "" +msgstr "GNU/Linux" #: templates/download-options.html:13 msgid "MacOS" -msgstr "" +msgstr "MacOS" #: templates/download-options.html:43 msgid "Tor Browser for Android Alpha"

1 0

[tor/master] Make sure that we free 'addr' at the end of a pair of addr tests
by nickm＠torproject.org 09 Apr '20

09 Apr '20

commit 29693b83bcfef517469d3afe7a54195adf7f378f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 9 07:54:23 2020 -0400 Make sure that we free 'addr' at the end of a pair of addr tests Fixes a couple of Coverity warnings about possible memory leaks. Bug not in any released Tor. --- src/test/test_addr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 82d388b2a..cf5aad7e7 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -1751,10 +1751,9 @@ test_addr_is_valid(void *arg) get_af_unspec(test_addr); TEST_ADDR_VALIDITY(test_addr, 0, 0); TEST_ADDR_VALIDITY(test_addr, 1, 0); - tor_free(test_addr); done: - ; + tor_free(test_addr); } #define TEST_ADDR_IS_NULL(a, rv) STMT_BEGIN \ @@ -1797,10 +1796,9 @@ test_addr_is_null(void *arg) /* Test for address family AF_UNSPEC. */ get_af_unspec(test_addr); TEST_ADDR_IS_NULL(test_addr, 1); - tor_free(test_addr); done: - ; + tor_free(test_addr); } #ifndef COCCI

1 0

[tor/master] hs-v3: Several fixes after #32542 review
by asn＠torproject.org 09 Apr '20

09 Apr '20

commit cca9e1c803161e41df418498e267605d855b7ac5 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Apr 8 09:58:17 2020 -0400 hs-v3: Several fixes after #32542 review asn: Accidentally left this commit out when merging #32542, so cherry-picking it now. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/hs/hs_client.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index cf2f165c9..f7294447b 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -970,6 +970,12 @@ intro_points_all_timed_out(const ed25519_public_key_t *service_pk) tor_assert(service_pk); const hs_descriptor_t *desc = hs_cache_lookup_as_client(service_pk); + if (BUG(!desc)) { + /* We can't introduce without a descriptor so ending up here means somehow + * between the introduction failure and this, the cache entry was removed + * which shouldn't be possible in theory. */ + goto end; + } SMARTLIST_FOREACH_BEGIN(desc->encrypted_data.intro_points, const hs_desc_intro_point_t *, ip) { @@ -997,7 +1003,7 @@ intro_points_all_timed_out(const ed25519_public_key_t *service_pk) * error code so if the connection to the rendezvous point ends up not * working, this code could be sent back as a reason. */ static void -socks_report_rend_circuit_timed_out(const origin_circuit_t *rend_circ) +socks_mark_rend_circuit_timed_out(const origin_circuit_t *rend_circ) { tor_assert(rend_circ); @@ -1021,7 +1027,7 @@ socks_report_rend_circuit_timed_out(const origin_circuit_t *rend_circ) * SOCKS5_HS_INTRO_TIMEDOUT (0xF7) if all intros have timed out. The caller * has to make sure to close the entry connections. */ static void -socks_report_introduction_failed(entry_connection_t *conn, +socks_mark_introduction_failed(entry_connection_t *conn, const ed25519_public_key_t *identity_pk) { socks5_reply_status_t code = SOCKS5_HS_INTRO_FAILED; @@ -1390,7 +1396,7 @@ client_desc_has_arrived(const smartlist_t *entry_conns) "Closing streams."); /* Report the extended socks error code that we were unable to introduce * to the service. */ - socks_report_introduction_failed(entry_conn, identity_pk); + socks_mark_introduction_failed(entry_conn, identity_pk); connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_RESOLVEFAILED); @@ -1863,7 +1869,7 @@ hs_client_circuit_cleanup_on_close(const circuit_t *circ) * connection would get closed before the circuit is freed and thus * would fail to report the error code. */ if (has_timed_out) { - socks_report_rend_circuit_timed_out(CONST_TO_ORIGIN_CIRCUIT(circ)); + socks_mark_rend_circuit_timed_out(CONST_TO_ORIGIN_CIRCUIT(circ)); } break; default:

1 0