September 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit c3debdfe6cef2382d4807a3f9292dd7bd87965a5 Merge: 3a7e2ce1b c894e9d3d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:29:10 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.0] Always allow extra file descriptors when setting the connection maximum
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit 878e0d45a5d1469965d456a5d8a436b45ac59c3a Author: teor <teor2345(a)gmail.com> Date: Mon Jul 3 15:30:52 2017 +1000 Always allow extra file descriptors when setting the connection maximum When setting the maximum number of connections allowed by the OS, always allow some extra file descriptors for other files. Fixes bug 22797; bugfix on 0.2.0.10-alpha. --- changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/changes/bug22797 b/changes/bug22797 new file mode 100644 index 000000000..619baaa40 --- /dev/null +++ b/changes/bug22797 @@ -0,0 +1,4 @@ + o Minor bugfixes (file limits): + - When setting the maximum number of connections allowed by the OS, + always allow some extra file descriptors for other files. + Fixes bug 22797; bugfix on 0.2.0.10-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index e25ecc462..eee52ad34 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1568,19 +1568,24 @@ set_max_file_descriptors(rlim_t limit, int *max_out) if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { int bad = 1; #ifdef OPEN_MAX - if (errno == EINVAL && OPEN_MAX < rlim.rlim_cur) { + uint64_t try_limit = OPEN_MAX - ULIMIT_BUFFER; + if (errno == EINVAL && try_limit < rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ - rlim.rlim_cur = OPEN_MAX; + rlim.rlim_cur = try_limit; if (setrlimit(RLIMIT_NOFILE, &rlim) == 0) { if (rlim.rlim_cur < (rlim_t)limit) { log_warn(LD_CONFIG, "We are limited to %lu file descriptors by " - "OPEN_MAX, and ConnLimit is %lu. Changing ConnLimit; sorry.", - (unsigned long)OPEN_MAX, (unsigned long)limit); + "OPEN_MAX (%lu), and ConnLimit is %lu. Changing " + "ConnLimit; sorry.", + (unsigned long)try_limit, (unsigned long)OPEN_MAX, + (unsigned long)limit); } else { - log_info(LD_CONFIG, "Dropped connection limit to OPEN_MAX (%lu); " - "Apparently, %lu was too high and rlimit lied to us.", - (unsigned long)OPEN_MAX, (unsigned long)rlim.rlim_max); + log_info(LD_CONFIG, "Dropped connection limit to %lu based on " + "OPEN_MAX (%lu); Apparently, %lu was too high and rlimit " + "lied to us.", + (unsigned long)try_limit, (unsigned long)OPEN_MAX, + (unsigned long)rlim.rlim_max); } bad = 0; }

1 0

[tor/maint-0.2.9] Always allow extra file descriptors when setting the connection maximum
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit 878e0d45a5d1469965d456a5d8a436b45ac59c3a Author: teor <teor2345(a)gmail.com> Date: Mon Jul 3 15:30:52 2017 +1000 Always allow extra file descriptors when setting the connection maximum When setting the maximum number of connections allowed by the OS, always allow some extra file descriptors for other files. Fixes bug 22797; bugfix on 0.2.0.10-alpha. --- changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/changes/bug22797 b/changes/bug22797 new file mode 100644 index 000000000..619baaa40 --- /dev/null +++ b/changes/bug22797 @@ -0,0 +1,4 @@ + o Minor bugfixes (file limits): + - When setting the maximum number of connections allowed by the OS, + always allow some extra file descriptors for other files. + Fixes bug 22797; bugfix on 0.2.0.10-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index e25ecc462..eee52ad34 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1568,19 +1568,24 @@ set_max_file_descriptors(rlim_t limit, int *max_out) if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { int bad = 1; #ifdef OPEN_MAX - if (errno == EINVAL && OPEN_MAX < rlim.rlim_cur) { + uint64_t try_limit = OPEN_MAX - ULIMIT_BUFFER; + if (errno == EINVAL && try_limit < rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ - rlim.rlim_cur = OPEN_MAX; + rlim.rlim_cur = try_limit; if (setrlimit(RLIMIT_NOFILE, &rlim) == 0) { if (rlim.rlim_cur < (rlim_t)limit) { log_warn(LD_CONFIG, "We are limited to %lu file descriptors by " - "OPEN_MAX, and ConnLimit is %lu. Changing ConnLimit; sorry.", - (unsigned long)OPEN_MAX, (unsigned long)limit); + "OPEN_MAX (%lu), and ConnLimit is %lu. Changing " + "ConnLimit; sorry.", + (unsigned long)try_limit, (unsigned long)OPEN_MAX, + (unsigned long)limit); } else { - log_info(LD_CONFIG, "Dropped connection limit to OPEN_MAX (%lu); " - "Apparently, %lu was too high and rlimit lied to us.", - (unsigned long)OPEN_MAX, (unsigned long)rlim.rlim_max); + log_info(LD_CONFIG, "Dropped connection limit to %lu based on " + "OPEN_MAX (%lu); Apparently, %lu was too high and rlimit " + "lied to us.", + (unsigned long)try_limit, (unsigned long)OPEN_MAX, + (unsigned long)rlim.rlim_max); } bad = 0; }

1 0

[tor/maint-0.3.0] Always allow extra file descriptors when setting the connection maximum
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit 878e0d45a5d1469965d456a5d8a436b45ac59c3a Author: teor <teor2345(a)gmail.com> Date: Mon Jul 3 15:30:52 2017 +1000 Always allow extra file descriptors when setting the connection maximum When setting the maximum number of connections allowed by the OS, always allow some extra file descriptors for other files. Fixes bug 22797; bugfix on 0.2.0.10-alpha. --- changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/changes/bug22797 b/changes/bug22797 new file mode 100644 index 000000000..619baaa40 --- /dev/null +++ b/changes/bug22797 @@ -0,0 +1,4 @@ + o Minor bugfixes (file limits): + - When setting the maximum number of connections allowed by the OS, + always allow some extra file descriptors for other files. + Fixes bug 22797; bugfix on 0.2.0.10-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index e25ecc462..eee52ad34 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1568,19 +1568,24 @@ set_max_file_descriptors(rlim_t limit, int *max_out) if (setrlimit(RLIMIT_NOFILE, &rlim) != 0) { int bad = 1; #ifdef OPEN_MAX - if (errno == EINVAL && OPEN_MAX < rlim.rlim_cur) { + uint64_t try_limit = OPEN_MAX - ULIMIT_BUFFER; + if (errno == EINVAL && try_limit < rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ - rlim.rlim_cur = OPEN_MAX; + rlim.rlim_cur = try_limit; if (setrlimit(RLIMIT_NOFILE, &rlim) == 0) { if (rlim.rlim_cur < (rlim_t)limit) { log_warn(LD_CONFIG, "We are limited to %lu file descriptors by " - "OPEN_MAX, and ConnLimit is %lu. Changing ConnLimit; sorry.", - (unsigned long)OPEN_MAX, (unsigned long)limit); + "OPEN_MAX (%lu), and ConnLimit is %lu. Changing " + "ConnLimit; sorry.", + (unsigned long)try_limit, (unsigned long)OPEN_MAX, + (unsigned long)limit); } else { - log_info(LD_CONFIG, "Dropped connection limit to OPEN_MAX (%lu); " - "Apparently, %lu was too high and rlimit lied to us.", - (unsigned long)OPEN_MAX, (unsigned long)rlim.rlim_max); + log_info(LD_CONFIG, "Dropped connection limit to %lu based on " + "OPEN_MAX (%lu); Apparently, %lu was too high and rlimit " + "lied to us.", + (unsigned long)try_limit, (unsigned long)OPEN_MAX, + (unsigned long)rlim.rlim_max); } bad = 0; }

1 0

[tor/maint-0.2.9] Merge branch 'teor-bug22797-025' into maint-0.2.9
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit a25d97e53046132567fd78e82791a2f8cad7b199 Merge: 3cace828a 878e0d45a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:28:59 2017 -0400 Merge branch 'teor-bug22797-025' into maint-0.2.9 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.2.9] Fix mixed-sign comparison warning in fix for 22797.
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit 6a49e3360bcb30b267da4a47af749bd4571ee72d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 15:56:57 2017 -0400 Fix mixed-sign comparison warning in fix for 22797. --- src/common/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compat.c b/src/common/compat.c index 3ebcfad14..e16dfb1d2 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1719,7 +1719,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out) int bad = 1; #ifdef OPEN_MAX uint64_t try_limit = OPEN_MAX - ULIMIT_BUFFER; - if (errno == EINVAL && try_limit < rlim.rlim_cur) { + if (errno == EINVAL && try_limit < (uint64_t) rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ rlim.rlim_cur = try_limit;

1 0

[tor/master] Taboo the get_options() function while options are validating
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit c4cb969a2a90570120f57f72448241af41e21e97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 6 16:50:05 2017 -0400 Taboo the get_options() function while options are validating When option validation or transition is happening, there are no "current options" -- only "old options" and "maybe new options". Looking at get_options() is likely a mistake, so have a nonfatal assertion let us know if we do that. Closes 22281. --- changes/ticket22281 | 3 +++ src/or/config.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/changes/ticket22281 b/changes/ticket22281 new file mode 100644 index 000000000..95787580f --- /dev/null +++ b/changes/ticket22281 @@ -0,0 +1,3 @@ + o Minor features (bug detection): + - Log a warning message, with stack trace, for any attempt to call + get_options() during option validation. Closes ticket 22281. diff --git a/src/or/config.c b/src/or/config.c index eb89d6f5e..2c507ab9d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -766,6 +766,9 @@ static int have_parsed_cmdline = 0; static char *global_dirfrontpagecontents = NULL; /** List of port_cfg_t for all configured ports. */ static smartlist_t *configured_ports = NULL; +/** True iff we're currently validating options, and any calls to + * get_options() are likely to be bugs. */ +static int in_option_validation = 0; /** Return the contents of our frontpage string, or NULL if not configured. */ MOCK_IMPL(const char*, @@ -779,6 +782,7 @@ MOCK_IMPL(or_options_t *, get_options_mutable, (void)) { tor_assert(global_options); + tor_assert_nonfatal(! in_option_validation); return global_options; } @@ -2304,24 +2308,35 @@ options_trial_assign(config_line_t *list, unsigned flags, char **msg) return r; } + setopt_err_t rv; + + in_option_validation = 1; + if (options_validate(get_options_mutable(), trial_options, global_default_options, 1, msg) < 0) { or_options_free(trial_options); - return SETOPT_ERR_PARSE; /*XXX make this a separate return value. */ + rv = SETOPT_ERR_PARSE; /*XXX make this a separate return value. */ + goto done; } if (options_transition_allowed(get_options(), trial_options, msg) < 0) { or_options_free(trial_options); - return SETOPT_ERR_TRANSITION; + rv = SETOPT_ERR_TRANSITION; + goto done; } + in_option_validation = 0; if (set_options(trial_options, msg)<0) { or_options_free(trial_options); - return SETOPT_ERR_SETTING; + rv = SETOPT_ERR_SETTING; + goto done; } /* we liked it. put it in place. */ - return SETOPT_OK; + rv = SETOPT_OK; + done: + in_option_validation = 0; + return rv; } /** Print a usage message for tor. */ @@ -2824,8 +2839,11 @@ static int options_validate_cb(void *old_options, void *options, void *default_options, int from_setconf, char **msg) { - return options_validate(old_options, options, default_options, + in_option_validation = 1; + int rv = options_validate(old_options, options, default_options, from_setconf, msg); + in_option_validation = 0; + return rv; } #define REJECT(arg) \ @@ -5200,6 +5218,7 @@ options_init_from_string(const char *cf_defaults, const char *cf, } newoptions->IncludeUsed = cf_has_include; + in_option_validation = 1; /* Validate newoptions */ if (options_validate(oldoptions, newoptions, newdefaultoptions, @@ -5212,17 +5231,20 @@ options_init_from_string(const char *cf_defaults, const char *cf, err = SETOPT_ERR_TRANSITION; goto err; } + in_option_validation = 0; if (set_options(newoptions, msg)) { err = SETOPT_ERR_SETTING; goto err; /* frees and replaces old options */ } + or_options_free(global_default_options); global_default_options = newdefaultoptions; return SETOPT_OK; err: + in_option_validation = 0; or_options_free(newoptions); or_options_free(newdefaultoptions); if (*msg) {

1 0

[tor/master] Merge branch 'ticket22281_squashed'
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit b9ecb522fce8f54cc03548f6dc9572f3de9d9259 Merge: fca590a63 c4cb969a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:23:24 2017 -0400 Merge branch 'ticket22281_squashed' changes/ticket22281 | 3 +++ src/or/config.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-)

1 0

[tor/master] Merge branch 'ticket23304_032_01_squashed'
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit fca590a63f8950b910d4f6b3a4ff39a009e9bf32 Merge: 59072d202 00967cd2a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:13:55 2017 -0400 Merge branch 'ticket23304_032_01_squashed' src/or/hs_client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] prop224: Log undecodable descriptor when SafeLogging is off
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit 00967cd2a87f8ef4c30bfcebd8eae9c9fb2ed251 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Aug 31 12:33:52 2017 -0400 prop224: Log undecodable descriptor when SafeLogging is off Closes #23304 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/or/hs_client.c b/src/or/hs_client.c index 99be058eb..75cc45b3b 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -903,7 +903,10 @@ hs_client_decode_descriptor(const char *desc_str, ret = hs_desc_decode_descriptor(desc_str, subcredential, desc); memwipe(subcredential, 0, sizeof(subcredential)); if (ret < 0) { - log_warn(LD_GENERAL, "Could not parse received descriptor as client"); + log_warn(LD_GENERAL, "Could not parse received descriptor as client."); + if (get_options()->SafeLogging_ == SAFELOG_SCRUB_NONE) { + log_warn(LD_GENERAL, "%s", escaped(desc_str)); + } goto err; }

1 0