May 2014 - tor-commits - lists.torproject.org

[tor/release-0.2.4] Supply better and less frequent warnings on circID exhaustion
by nickm＠torproject.org 08 May '14

08 May '14

commit bb9b4c37f8e7f5cf78918f382e90d8b11ff42551 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 18 12:28:30 2014 -0400 Supply better and less frequent warnings on circID exhaustion Fixes the surface behavior of #11553 --- changes/bug11553 | 5 +++++ src/or/channel.h | 2 ++ src/or/circuitbuild.c | 9 ++++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/changes/bug11553 b/changes/bug11553 new file mode 100644 index 0000000..1540f46 --- /dev/null +++ b/changes/bug11553 @@ -0,0 +1,5 @@ + o Minor features: + - When we run out of usable circuit IDs on a channel, log only one + warning for the whole channel, and include a description of + how many circuits there were on the channel. Fix for part of ticket + #11553. diff --git a/src/or/channel.h b/src/or/channel.h index 2dca817..29ba40e 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -148,6 +148,8 @@ struct channel_s { ENUM_BF(circ_id_type_t) circ_id_type:2; /** DOCDOC*/ unsigned wide_circ_ids:1; + /** Have we logged a warning about circID exhaustion on this channel? */ + unsigned warned_circ_ids_exhausted:1; /* * Which circ_id do we try to use next on this connection? This is * always in the range 0..1<<15-1. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index e47a278..2b4d3c3 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -127,7 +127,14 @@ get_unique_circ_id_by_chan(channel_t *chan) /* Make sure we don't loop forever if all circ_id's are used. This * matters because it's an external DoS opportunity. */ - log_warn(LD_CIRC,"No unused circ IDs. Failing."); + if (! chan->warned_circ_ids_exhausted) { + chan->warned_circ_ids_exhausted = 1; + log_warn(LD_CIRC,"No unused circIDs found on channel %s wide " + "circID support, with %u inbound and %u outbound circuits. " + "Failing a circuit.", + chan->wide_circ_ids ? "with" : "without", + chan->num_p_circuits, chan->num_n_circuits); + } return 0; } test_circ_id |= high_bit;

1 0

[tor/release-0.2.4] Teach the get_mozilla_ciphers.py script to parse recent firefoxen
by nickm＠torproject.org 08 May '14

08 May '14

commit d00dc9f7d1b98dd80bbc890db1ddf497aae3bb9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 8 03:19:38 2014 -0400 Teach the get_mozilla_ciphers.py script to parse recent firefoxen --- src/common/get_mozilla_ciphers.py | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/src/common/get_mozilla_ciphers.py b/src/common/get_mozilla_ciphers.py index c7e9a84..0636eb3 100644 --- a/src/common/get_mozilla_ciphers.py +++ b/src/common/get_mozilla_ciphers.py @@ -41,12 +41,12 @@ fileA = open(ff('security/manager/ssl/src/nsNSSComponent.cpp'),'r') inCipherSection = False cipherLines = [] for line in fileA: - if line.startswith('static CipherPref CipherPrefs'): + if line.startswith('static const CipherPref sCipherPrefs[]'): # Get the starting boundary of the Cipher Preferences inCipherSection = True elif inCipherSection: line = line.strip() - if line.startswith('{NULL, 0}'): + if line.startswith('{ nullptr, 0}'): # At the ending boundary of the Cipher Prefs break else: @@ -56,12 +56,30 @@ fileA.close() # Parse the lines and put them into a dict ciphers = {} cipher_pref = {} +key_pending = None for line in cipherLines: - m = re.search(r'^{\s*\"([^\"]+)\",\s*(\S*)\s*}', line) + m = re.search(r'^{\s*\"([^\"]+)\",\s*(\S+)\s*(?:,\s*(true|false))?\s*}', line) if m: - key,value = m.groups() - ciphers[key] = value - cipher_pref[value] = key + assert not key_pending + key,value,enabled = m.groups() + if enabled == 'true': + ciphers[key] = value + cipher_pref[value] = key + continue + m = re.search(r'^{\s*\"([^\"]+)\",', line) + if m: + assert not key_pending + key_pending = m.group(1) + continue + m = re.search(r'^\s*(\S+)(?:,\s*(true|false))?\s*}', line) + if m: + assert key_pending + key = key_pending + value,enabled = m.groups() + key_pending = None + if enabled == 'true': + ciphers[key] = value + cipher_pref[value] = key #### # Now find the correct order for the ciphers

1 0

[tor/release-0.2.4] Forbid TunneledDirConns 0 and PreferTunneledDirConns 0 if being a HS
by nickm＠torproject.org 08 May '14

08 May '14

commit f8248abbd6c5e04037cedee29a8867700617acde Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 25 14:24:41 2014 -0400 Forbid TunneledDirConns 0 and PreferTunneledDirConns 0 if being a HS Fixes bug 10849; bugfix on 0.2.1.1-alpha (I believe) --- changes/bug10849_023 | 6 ++++++ src/or/config.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/changes/bug10849_023 b/changes/bug10849_023 new file mode 100644 index 0000000..480dea3 --- /dev/null +++ b/changes/bug10849_023 @@ -0,0 +1,6 @@ + o Major bugfixes: + - When running a hidden service, do not allow TunneledDirConns 0; + this will keep the hidden service from running, and also + make it publish its descriptors directly over HTTP. Fixes bug 10849; + bugfix on 0.2.1.1-alpha. + diff --git a/src/or/config.c b/src/or/config.c index d5c5689..f6db98e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4049,6 +4049,10 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("If you set UseBridges, you must specify at least one bridge."); if (options->UseBridges && !options->TunnelDirConns) REJECT("If you set UseBridges, you must set TunnelDirConns."); + if (options->RendConfigLines && + (!options->TunnelDirConns || !options->PreferTunneledDirConns)) + REJECT("If you are running a hidden service, you must set TunnelDirConns " + "and PreferTunneledDirConns"); for (cl = options->Bridges; cl; cl = cl->next) { if (parse_bridge_line(cl->value, 1)<0)

1 0

[tor/release-0.2.4] Drop the MaxMemInCellQueues lower limit down to 256 MB.
by nickm＠torproject.org 08 May '14

08 May '14

commit 35699ef9f5d2814203653e16cb0cd176a0190ae0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 20 12:12:47 2013 -0500 Drop the MaxMemInCellQueues lower limit down to 256 MB. on #9686, gmorehose reports that the 500 MB lower limit is too high for raspberry pi users. This is a backport of 647248729fa65f0e51d062e2af8f4e8b38592bf5 to 0.2.4. Note that in 0.2.4, the option is called MaxMemInCellQueues. --- changes/bug9686_024 | 5 +++++ src/or/config.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changes/bug9686_024 b/changes/bug9686_024 new file mode 100644 index 0000000..8705379 --- /dev/null +++ b/changes/bug9686_024 @@ -0,0 +1,5 @@ + o Minor features (security): + - Decrease the lower limit of MaxMemInCellQueues to 256 MBytes (but leave + the default at 8GBytes), to better support Raspberry Pi users. Fixes + bug 9686; bugfix on 0.2.4.14-alpha. + diff --git a/src/or/config.c b/src/or/config.c index ef02946..85a5e83 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2616,10 +2616,10 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("If EntryNodes is set, UseEntryGuards must be enabled."); } - if (options->MaxMemInCellQueues < (500 << 20)) { - log_warn(LD_CONFIG, "MaxMemInCellQueues must be at least 500 MB for now. " + if (options->MaxMemInCellQueues < (256 << 20)) { + log_warn(LD_CONFIG, "MaxMemInCellQueues must be at least 256 MB for now. " "Ideally, have it as large as you can afford."); - options->MaxMemInCellQueues = (500 << 20); + options->MaxMemInCellQueues = (256 << 20); } options->AllowInvalid_ = 0;

1 0

[tor/release-0.2.4] Stop leaking memory in error cases of md parsing
by nickm＠torproject.org 08 May '14

08 May '14

commit 65575b0755f64d21d59532bf58e6c27e14086bbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Apr 26 12:45:34 2014 -0400 Stop leaking memory in error cases of md parsing When clearing a list of tokens, it's important to do token_clear() on them first, or else any keys they contain will leak. This didn't leak memory on any of the successful microdescriptor parsing paths, but it does leak on some failing paths when the failure happens during tokenization. Fixes bug 11618; bugfix on 0.2.2.6-alpha. --- changes/md_leak_bug | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/changes/md_leak_bug b/changes/md_leak_bug new file mode 100644 index 0000000..26270aa --- /dev/null +++ b/changes/md_leak_bug @@ -0,0 +1,5 @@ + o Major bugfixes (security, OOM) + - Fix a memory leak that could occur if a microdescriptor parse + fails during the tokenizing step. This could enable a memory + exhaustion attack by directory servers. Fixes bug #11649; bugfix + on 0.2.2.6-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 97e0bc8..3ff887c 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4455,11 +4455,13 @@ microdescs_parse_from_string(const char *s, const char *eos, microdesc_free(md); md = NULL; + SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_clear(t)); memarea_clear(area); smartlist_clear(tokens); s = start_of_next_microdesc; } + SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_clear(t)); memarea_drop_all(area); smartlist_free(tokens);

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug10849_023_bruteforce' into maint-0.2.3
by nickm＠torproject.org 08 May '14

08 May '14

commit 8828794dc295e3d40dbc35cd58f4c449c632085b Merge: 65575b0 f8248ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 30 20:23:22 2014 -0400 Merge remote-tracking branch 'public/bug10849_023_bruteforce' into maint-0.2.3 changes/bug10849_023 | 6 ++++++ src/or/config.c | 4 ++++ 2 files changed, 10 insertions(+)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 08 May '14

08 May '14

commit 1d3ffc0ec96777203b2eafee5905464d54ef9f91 Merge: 9e44df2 65575b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 29 13:02:18 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/md_leak_bug | 5 +++++ src/or/routerparse.c | 2 ++ 2 files changed, 7 insertions(+)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 08 May '14

08 May '14

commit efab3484e6ea3a799ccf61061450cfc35791ad41 Merge: 35699ef 8828794 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 30 20:25:15 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug10849_023 | 6 ++++++ src/or/config.c | 4 ++++ 2 files changed, 10 insertions(+)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 08 May '14

08 May '14

commit 14bc6e8993c694702f5ab637c36b962f396660a5 Merge: efab348 6a4f5d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 1 11:44:25 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 Conflicts: src/or/microdesc.c changes/bug7164_downgrade | 6 ++++++ src/or/microdesc.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --cc src/or/microdesc.c index 90ac0ac,4acec6a..0e72c0b --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@@ -614,13 -561,11 +614,13 @@@ microdesc_free_(microdesc_t *md, const } }); if (found) { - log_warn(LD_BUG, "microdesc_free() called from %s:%d, but md was still " - log_info(LD_BUG, "microdesc_free() called, but md was still referenced " - "%d node(s); held_by_nodes == %u", found, md->held_by_nodes); ++ log_info(LD_BUG, "microdesc_free() called from %s:%d, but md was still " + "referenced %d node(s); held_by_nodes == %u", + fname, lineno, found, md->held_by_nodes); } else { - log_warn(LD_BUG, "microdesc_free() called with held_by_nodes set to %u, " - "but md was not referenced by any nodes", md->held_by_nodes); + log_warn(LD_BUG, "microdesc_free() called from %s:%d with held_by_nodes " + "set to %u, but md was not referenced by any nodes", + fname, lineno, md->held_by_nodes); } tor_fragile_assert(); }

1 0

[tor/release-0.2.4] Downgrade bug 7164 warning to INFO
by nickm＠torproject.org 08 May '14

08 May '14

commit 6a4f5d9b4df1d05d1b158417cfcc85a547ad1549 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 1 11:42:02 2014 -0400 Downgrade bug 7164 warning to INFO The 0.2.5.x warning is the one that might help us track this down; the warnings in stable are just annoying users over and over and over. --- changes/bug7164_downgrade | 6 ++++++ src/or/microdesc.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug7164_downgrade b/changes/bug7164_downgrade new file mode 100644 index 0000000..4d75586 --- /dev/null +++ b/changes/bug7164_downgrade @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Downgrade the warning severity for the the "md was still referenced 1 + node(s)" warning. Tor 0.2.5.4-alpha has better code for trying to + diagnose this bug, and the current warning in earlier versions of + tor achieves nothing useful. Addresses warning from bug 7164. + diff --git a/src/or/microdesc.c b/src/or/microdesc.c index b4d22c1..4acec6a 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -561,7 +561,7 @@ microdesc_free(microdesc_t *md) } }); if (found) { - log_warn(LD_BUG, "microdesc_free() called, but md was still referenced " + log_info(LD_BUG, "microdesc_free() called, but md was still referenced " "%d node(s); held_by_nodes == %u", found, md->held_by_nodes); } else { log_warn(LD_BUG, "microdesc_free() called with held_by_nodes set to %u, "

1 0