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

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by dgoulet＠torproject.org 18 Aug '20

18 Aug '20

commit 622b0f2fb1acda3e92853436f2154e1c32a297e3 Merge: 8ca4782340 deea196370 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Aug 18 08:49:07 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket24308 | 6 ++++++ src/app/config/config.c | 29 +++++++++++++++++++++++------ src/app/config/config.h | 2 +- 3 files changed, 30 insertions(+), 7 deletions(-)

1 0

[tor/master] Lower the minimum value for MaxMemInQueues to 64 MB for relays.
by dgoulet＠torproject.org 18 Aug '20

18 Aug '20

commit a02002dc9915d4f26d374f0784c7cbf916a653b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 17:01:49 2020 -0400 Lower the minimum value for MaxMemInQueues to 64 MB for relays. For clients, there is no minimum value; in both cases, we warn if the value seems too low. Closes ticket 24308. --- changes/ticket24308 | 6 ++++++ src/app/config/config.c | 25 +++++++++++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/changes/ticket24308 b/changes/ticket24308 new file mode 100644 index 0000000000..e614785265 --- /dev/null +++ b/changes/ticket24308 @@ -0,0 +1,6 @@ + o Minor features (denial-of-service memory limiter): + - Allow the user to configure even lower values for the MaxMemInQueues + parameter. Relays now enforce a minimum of 64 MB, when previously + the minimum was 256 MB. On clients, there is no minimum. Relays and + clients will both warn if the value is set so low that Tor is likely + to stop working. Closes ticket 24308. diff --git a/src/app/config/config.c b/src/app/config/config.c index 8e21d67f23..94971e3bfd 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -4585,6 +4585,9 @@ options_validate(or_options_t *old_options, or_options_t *options, STATIC uint64_t compute_real_max_mem_in_queues(const uint64_t val, bool is_server) { +#define MIN_SERVER_MB 64 +#define MIN_UNWARNED_SERVER_MB 256 +#define MIN_UNWARNED_CLIENT_MB 64 uint64_t result; if (val == 0) { @@ -4650,10 +4653,24 @@ compute_real_max_mem_in_queues(const uint64_t val, bool is_server) notice_sent = 1; } return result; - } else if (val < ONE_GIGABYTE / 4) { - log_warn(LD_CONFIG, "MaxMemInQueues must be at least 256 MB for now. " - "Ideally, have it as large as you can afford."); - return ONE_GIGABYTE / 4; + } else if (is_server && val < ONE_MEGABYTE * MIN_SERVER_MB) { + /* We can't configure less than this much on a server. */ + log_warn(LD_CONFIG, "MaxMemInQueues must be at least %d MB on servers " + "for now. Ideally, have it as large as you can afford.", + MIN_SERVER_MB); + return MIN_SERVER_MB * ONE_MEGABYTE; + } else if (is_server && val < ONE_MEGABYTE * MIN_UNWARNED_SERVER_MB) { + /* On a server, if it's less than this much, we warn that things + * may go badly. */ + log_warn(LD_CONFIG, "MaxMemInQueues is set to a low value; if your " + "relay doesn't work, this may be the reason why."); + return val; + } else if (! is_server && val < ONE_MEGABYTE * MIN_UNWARNED_CLIENT_MB) { + /* On a client, if it's less than this much, we warn that things + * may go badly. */ + log_warn(LD_CONFIG, "MaxMemInQueues is set to a low value; if your " + "client doesn't work, this may be the reason why."); + return val; } else { /* The value was fine all along */ return val;

1 0

[tor/release-0.4.4] Rename argument to compute_real_max_mem_in_queues()
by dgoulet＠torproject.org 18 Aug '20

18 Aug '20

commit 431dcc42e028e1b56f60131e3e153296ff73c25e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:59:07 2020 -0400 Rename argument to compute_real_max_mem_in_queues() --- src/app/config/config.c | 4 ++-- src/app/config/config.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 1d61b76310..8e21d67f23 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -4583,7 +4583,7 @@ options_validate(or_options_t *old_options, or_options_t *options, * actual maximum value. We clip this value if it's too low, and autodetect * it if it's set to 0. */ STATIC uint64_t -compute_real_max_mem_in_queues(const uint64_t val, int log_guess) +compute_real_max_mem_in_queues(const uint64_t val, bool is_server) { uint64_t result; @@ -4642,7 +4642,7 @@ compute_real_max_mem_in_queues(const uint64_t val, int log_guess) result = avail; } } - if (log_guess && ! notice_sent) { + if (is_server && ! notice_sent) { log_notice(LD_CONFIG, "%sMaxMemInQueues is set to %"PRIu64" MB. " "You can override this by setting MaxMemInQueues by hand.", ram ? "Based on detected system memory, " : "", diff --git a/src/app/config/config.h b/src/app/config/config.h index 301faf7067..35905ef767 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -290,7 +290,7 @@ STATIC int parse_port_config(smartlist_t *out, STATIC int check_bridge_distribution_setting(const char *bd); STATIC uint64_t compute_real_max_mem_in_queues(const uint64_t val, - int log_guess); + bool is_server); STATIC int open_and_add_file_log(const log_severity_list_t *severity, const char *fname, int truncate_log);

1 0

[tor/master] Merge branch 'tor-gitlab/mr/121' into maint-0.4.4
by dgoulet＠torproject.org 18 Aug '20

18 Aug '20

commit deea19637006dd9bf65431acf2e15f96f3209602 Merge: ef18fb56c9 a02002dc99 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Aug 18 08:49:01 2020 -0400 Merge branch 'tor-gitlab/mr/121' into maint-0.4.4 changes/ticket24308 | 6 ++++++ src/app/config/config.c | 29 +++++++++++++++++++++++------ src/app/config/config.h | 2 +- 3 files changed, 30 insertions(+), 7 deletions(-) diff --cc src/app/config/config.h index 17caa0e3ff,35905ef767..1ba10d1d37 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@@ -292,9 -277,20 +292,9 @@@ STATIC int parse_dir_authority_line(con dirinfo_type_t required_type, int validate_only); STATIC int parse_dir_fallback_line(const char *line, int validate_only); -STATIC int have_enough_mem_for_dircache(const or_options_t *options, - size_t total_mem, char **msg); -STATIC int parse_port_config(smartlist_t *out, - const struct config_line_t *ports, - const char *portname, - int listener_type, - const char *defaultaddr, - int defaultport, - const unsigned flags); - -STATIC int check_bridge_distribution_setting(const char *bd); STATIC uint64_t compute_real_max_mem_in_queues(const uint64_t val, - int log_guess); + bool is_server); STATIC int open_and_add_file_log(const log_severity_list_t *severity, const char *fname, int truncate_log);

1 0

[tor/release-0.4.4] Lower the minimum value for MaxMemInQueues to 64 MB for relays.
by dgoulet＠torproject.org 18 Aug '20

18 Aug '20

commit a02002dc9915d4f26d374f0784c7cbf916a653b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 17:01:49 2020 -0400 Lower the minimum value for MaxMemInQueues to 64 MB for relays. For clients, there is no minimum value; in both cases, we warn if the value seems too low. Closes ticket 24308. --- changes/ticket24308 | 6 ++++++ src/app/config/config.c | 25 +++++++++++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/changes/ticket24308 b/changes/ticket24308 new file mode 100644 index 0000000000..e614785265 --- /dev/null +++ b/changes/ticket24308 @@ -0,0 +1,6 @@ + o Minor features (denial-of-service memory limiter): + - Allow the user to configure even lower values for the MaxMemInQueues + parameter. Relays now enforce a minimum of 64 MB, when previously + the minimum was 256 MB. On clients, there is no minimum. Relays and + clients will both warn if the value is set so low that Tor is likely + to stop working. Closes ticket 24308. diff --git a/src/app/config/config.c b/src/app/config/config.c index 8e21d67f23..94971e3bfd 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -4585,6 +4585,9 @@ options_validate(or_options_t *old_options, or_options_t *options, STATIC uint64_t compute_real_max_mem_in_queues(const uint64_t val, bool is_server) { +#define MIN_SERVER_MB 64 +#define MIN_UNWARNED_SERVER_MB 256 +#define MIN_UNWARNED_CLIENT_MB 64 uint64_t result; if (val == 0) { @@ -4650,10 +4653,24 @@ compute_real_max_mem_in_queues(const uint64_t val, bool is_server) notice_sent = 1; } return result; - } else if (val < ONE_GIGABYTE / 4) { - log_warn(LD_CONFIG, "MaxMemInQueues must be at least 256 MB for now. " - "Ideally, have it as large as you can afford."); - return ONE_GIGABYTE / 4; + } else if (is_server && val < ONE_MEGABYTE * MIN_SERVER_MB) { + /* We can't configure less than this much on a server. */ + log_warn(LD_CONFIG, "MaxMemInQueues must be at least %d MB on servers " + "for now. Ideally, have it as large as you can afford.", + MIN_SERVER_MB); + return MIN_SERVER_MB * ONE_MEGABYTE; + } else if (is_server && val < ONE_MEGABYTE * MIN_UNWARNED_SERVER_MB) { + /* On a server, if it's less than this much, we warn that things + * may go badly. */ + log_warn(LD_CONFIG, "MaxMemInQueues is set to a low value; if your " + "relay doesn't work, this may be the reason why."); + return val; + } else if (! is_server && val < ONE_MEGABYTE * MIN_UNWARNED_CLIENT_MB) { + /* On a client, if it's less than this much, we warn that things + * may go badly. */ + log_warn(LD_CONFIG, "MaxMemInQueues is set to a low value; if your " + "client doesn't work, this may be the reason why."); + return val; } else { /* The value was fine all along */ return val;

1 0

[tor/master] Merge branch 'maint-0.4.4'
by dgoulet＠torproject.org 18 Aug '20

18 Aug '20

commit 80d2376f33506adafd4e82cb7cd824f66d8e213a Merge: ebaa1a1d23 deea196370 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Aug 18 08:49:07 2020 -0400 Merge branch 'maint-0.4.4' changes/ticket24308 | 6 ++++++ src/app/config/config.c | 29 +++++++++++++++++++++++------ src/app/config/config.h | 2 +- 3 files changed, 30 insertions(+), 7 deletions(-)

1 0

[tor/release-0.4.4] Merge branch 'tor-gitlab/mr/121' into maint-0.4.4
by dgoulet＠torproject.org 18 Aug '20

18 Aug '20

commit deea19637006dd9bf65431acf2e15f96f3209602 Merge: ef18fb56c9 a02002dc99 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Aug 18 08:49:01 2020 -0400 Merge branch 'tor-gitlab/mr/121' into maint-0.4.4 changes/ticket24308 | 6 ++++++ src/app/config/config.c | 29 +++++++++++++++++++++++------ src/app/config/config.h | 2 +- 3 files changed, 30 insertions(+), 7 deletions(-) diff --cc src/app/config/config.h index 17caa0e3ff,35905ef767..1ba10d1d37 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@@ -292,9 -277,20 +292,9 @@@ STATIC int parse_dir_authority_line(con dirinfo_type_t required_type, int validate_only); STATIC int parse_dir_fallback_line(const char *line, int validate_only); -STATIC int have_enough_mem_for_dircache(const or_options_t *options, - size_t total_mem, char **msg); -STATIC int parse_port_config(smartlist_t *out, - const struct config_line_t *ports, - const char *portname, - int listener_type, - const char *defaultaddr, - int defaultport, - const unsigned flags); - -STATIC int check_bridge_distribution_setting(const char *bd); STATIC uint64_t compute_real_max_mem_in_queues(const uint64_t val, - int log_guess); + bool is_server); STATIC int open_and_add_file_log(const log_severity_list_t *severity, const char *fname, int truncate_log);

1 0

[tor/maint-0.4.4] Lower the minimum value for MaxMemInQueues to 64 MB for relays.
by dgoulet＠torproject.org 18 Aug '20

18 Aug '20

commit a02002dc9915d4f26d374f0784c7cbf916a653b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 17:01:49 2020 -0400 Lower the minimum value for MaxMemInQueues to 64 MB for relays. For clients, there is no minimum value; in both cases, we warn if the value seems too low. Closes ticket 24308. --- changes/ticket24308 | 6 ++++++ src/app/config/config.c | 25 +++++++++++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/changes/ticket24308 b/changes/ticket24308 new file mode 100644 index 0000000000..e614785265 --- /dev/null +++ b/changes/ticket24308 @@ -0,0 +1,6 @@ + o Minor features (denial-of-service memory limiter): + - Allow the user to configure even lower values for the MaxMemInQueues + parameter. Relays now enforce a minimum of 64 MB, when previously + the minimum was 256 MB. On clients, there is no minimum. Relays and + clients will both warn if the value is set so low that Tor is likely + to stop working. Closes ticket 24308. diff --git a/src/app/config/config.c b/src/app/config/config.c index 8e21d67f23..94971e3bfd 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -4585,6 +4585,9 @@ options_validate(or_options_t *old_options, or_options_t *options, STATIC uint64_t compute_real_max_mem_in_queues(const uint64_t val, bool is_server) { +#define MIN_SERVER_MB 64 +#define MIN_UNWARNED_SERVER_MB 256 +#define MIN_UNWARNED_CLIENT_MB 64 uint64_t result; if (val == 0) { @@ -4650,10 +4653,24 @@ compute_real_max_mem_in_queues(const uint64_t val, bool is_server) notice_sent = 1; } return result; - } else if (val < ONE_GIGABYTE / 4) { - log_warn(LD_CONFIG, "MaxMemInQueues must be at least 256 MB for now. " - "Ideally, have it as large as you can afford."); - return ONE_GIGABYTE / 4; + } else if (is_server && val < ONE_MEGABYTE * MIN_SERVER_MB) { + /* We can't configure less than this much on a server. */ + log_warn(LD_CONFIG, "MaxMemInQueues must be at least %d MB on servers " + "for now. Ideally, have it as large as you can afford.", + MIN_SERVER_MB); + return MIN_SERVER_MB * ONE_MEGABYTE; + } else if (is_server && val < ONE_MEGABYTE * MIN_UNWARNED_SERVER_MB) { + /* On a server, if it's less than this much, we warn that things + * may go badly. */ + log_warn(LD_CONFIG, "MaxMemInQueues is set to a low value; if your " + "relay doesn't work, this may be the reason why."); + return val; + } else if (! is_server && val < ONE_MEGABYTE * MIN_UNWARNED_CLIENT_MB) { + /* On a client, if it's less than this much, we warn that things + * may go badly. */ + log_warn(LD_CONFIG, "MaxMemInQueues is set to a low value; if your " + "client doesn't work, this may be the reason why."); + return val; } else { /* The value was fine all along */ return val;

1 0

[tor/maint-0.4.4] Rename argument to compute_real_max_mem_in_queues()
by dgoulet＠torproject.org 18 Aug '20

18 Aug '20

commit 431dcc42e028e1b56f60131e3e153296ff73c25e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 11 12:59:07 2020 -0400 Rename argument to compute_real_max_mem_in_queues() --- src/app/config/config.c | 4 ++-- src/app/config/config.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 1d61b76310..8e21d67f23 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -4583,7 +4583,7 @@ options_validate(or_options_t *old_options, or_options_t *options, * actual maximum value. We clip this value if it's too low, and autodetect * it if it's set to 0. */ STATIC uint64_t -compute_real_max_mem_in_queues(const uint64_t val, int log_guess) +compute_real_max_mem_in_queues(const uint64_t val, bool is_server) { uint64_t result; @@ -4642,7 +4642,7 @@ compute_real_max_mem_in_queues(const uint64_t val, int log_guess) result = avail; } } - if (log_guess && ! notice_sent) { + if (is_server && ! notice_sent) { log_notice(LD_CONFIG, "%sMaxMemInQueues is set to %"PRIu64" MB. " "You can override this by setting MaxMemInQueues by hand.", ram ? "Based on detected system memory, " : "", diff --git a/src/app/config/config.h b/src/app/config/config.h index 301faf7067..35905ef767 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -290,7 +290,7 @@ STATIC int parse_port_config(smartlist_t *out, STATIC int check_bridge_distribution_setting(const char *bd); STATIC uint64_t compute_real_max_mem_in_queues(const uint64_t val, - int log_guess); + bool is_server); STATIC int open_and_add_file_log(const log_severity_list_t *severity, const char *fname, int truncate_log);

1 0

[tor/maint-0.4.4] Merge branch 'tor-gitlab/mr/121' into maint-0.4.4
by dgoulet＠torproject.org 18 Aug '20

18 Aug '20

commit deea19637006dd9bf65431acf2e15f96f3209602 Merge: ef18fb56c9 a02002dc99 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Aug 18 08:49:01 2020 -0400 Merge branch 'tor-gitlab/mr/121' into maint-0.4.4 changes/ticket24308 | 6 ++++++ src/app/config/config.c | 29 +++++++++++++++++++++++------ src/app/config/config.h | 2 +- 3 files changed, 30 insertions(+), 7 deletions(-) diff --cc src/app/config/config.h index 17caa0e3ff,35905ef767..1ba10d1d37 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@@ -292,9 -277,20 +292,9 @@@ STATIC int parse_dir_authority_line(con dirinfo_type_t required_type, int validate_only); STATIC int parse_dir_fallback_line(const char *line, int validate_only); -STATIC int have_enough_mem_for_dircache(const or_options_t *options, - size_t total_mem, char **msg); -STATIC int parse_port_config(smartlist_t *out, - const struct config_line_t *ports, - const char *portname, - int listener_type, - const char *defaultaddr, - int defaultport, - const unsigned flags); - -STATIC int check_bridge_distribution_setting(const char *bd); STATIC uint64_t compute_real_max_mem_in_queues(const uint64_t val, - int log_guess); + bool is_server); STATIC int open_and_add_file_log(const log_severity_list_t *severity, const char *fname, int truncate_log);

1 0