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

[tor/release-0.2.8] Update versions to 0.2.8.8
by nickm＠torproject.org 23 Sep '16

23 Sep '16

commit ad1824f91de0a1acdc4b2830f5b7b6d841dc6eef Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 15:37:06 2016 -0400 Update versions to 0.2.8.8 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 76080f4..6150e7b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.7-dev]) +AC_INIT([tor],[0.2.8.8]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 1b0c23d..a4c98cd 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.7-dev" +!define VERSION "0.2.8.8" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index a3ad9de..2ca3448 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.7-dev" +#define VERSION "0.2.8.8"

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 23 Sep '16

23 Sep '16

commit 53d4c505cda3e129092366f863ce16a4ad192cfa Merge: 31df6a7 ad1824f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 15:37:12 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 23 Sep '16

23 Sep '16

commit f5deb2feaa0105610002459ad3f0defd3f33a534 Merge: 077f6a4 ad1824f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 15:37:27 2016 -0400 Merge branch 'maint-0.2.8'

1 0

[tor/master] bump master to 0.2.9.3-alpha
by nickm＠torproject.org 23 Sep '16

23 Sep '16

commit 33f81b8712cc28fab6c66a035889a277a3a0cdef Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 16:11:50 2016 -0400 bump master to 0.2.9.3-alpha --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index fc27017..92a90ee 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.9.2-alpha-dev]) +AC_INIT([tor],[0.2.9.3-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 9eec555..2d29666 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.9.2-alpha-dev" +!define VERSION "0.2.9.3-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 1e1c31d..2f44ba0 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.9.2-alpha-dev" +#define VERSION "0.2.9.3-alpha"

1 0

[tor/release-0.2.8] Merge branch 'bug20203_027_squashed' into maint-0.2.8
by nickm＠torproject.org 22 Sep '16

22 Sep '16

commit 6e96eababe8f05ac03b2e83911e6fae5654884b4 Merge: 1edea87 e4aaf76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 15:17:00 2016 -0400 Merge branch 'bug20203_027_squashed' into maint-0.2.8 changes/bug20203 | 6 ++++++ src/or/circuitlist.c | 10 ++++++++-- src/or/relay.c | 9 +++++++++ 3 files changed, 23 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 22 Sep '16

22 Sep '16

commit 077f6a4888e88a4895e7b2234ff2fd81412307d0 Merge: 0baa276 d78711c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 15:20:31 2016 -0400 Merge branch 'maint-0.2.8' changes/bug20203 | 6 ++++++ src/or/circuitlist.c | 10 ++++++++-- src/or/relay.c | 9 +++++++++ 3 files changed, 23 insertions(+), 2 deletions(-)

1 0

[tor/master] When clearing cells from a circuit for OOM reasons, tell cmux we did so.
by nickm＠torproject.org 22 Sep '16

22 Sep '16

commit e4aaf7666028c30866ad63053ad9f6eb6bf16bf7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 21 19:01:12 2016 -0400 When clearing cells from a circuit for OOM reasons, tell cmux we did so. Not telling the cmux would sometimes cause an assertion failure in relay.c when we tried to get an active circuit and found an "active" circuit with no cells. Additionally, replace that assert with a test and a log message. Fix for bug 20203. This is actually probably a bugfix on 0.2.8.1-alpha, specifically my code in 8b4e5b7ee902fb7fa0776 where I made circuit_mark_for_close_() do less in order to simplify our call graph. Thanks to "cypherpunks" for help diagnosing. --- changes/bug20203 | 6 ++++++ src/or/circuitlist.c | 10 ++++++++-- src/or/relay.c | 9 +++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/changes/bug20203 b/changes/bug20203 new file mode 100644 index 0000000..b4809ff --- /dev/null +++ b/changes/bug20203 @@ -0,0 +1,6 @@ + o Major bugfixes (relay, OOM handler) + - Fix a timing-dependent assertion failure that could occur when we + tried to flush from a circuit after having freed its cells because + of an out-of-memory condition. Fixes bug 20203; bugfix on + 0.2.8.1-alpha. Thanks to "cypherpunks" for help diagnosing this + one. diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 716024d..5fb8be5 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1836,8 +1836,14 @@ marked_circuit_free_cells(circuit_t *circ) return; } cell_queue_clear(&circ->n_chan_cells); - if (! CIRCUIT_IS_ORIGIN(circ)) - cell_queue_clear(& TO_OR_CIRCUIT(circ)->p_chan_cells); + if (circ->n_mux) + circuitmux_clear_num_cells(circ->n_mux, circ); + if (! CIRCUIT_IS_ORIGIN(circ)) { + or_circuit_t *orcirc = TO_OR_CIRCUIT(circ); + cell_queue_clear(&orcirc->p_chan_cells); + if (orcirc->p_mux) + circuitmux_clear_num_cells(orcirc->p_mux, circ); + } } static size_t diff --git a/src/or/relay.c b/src/or/relay.c index eddad6a..33191e1 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2619,6 +2619,15 @@ channel_flush_from_first_active_circuit, (channel_t *chan, int max)) } /* Circuitmux told us this was active, so it should have cells */ + if (/*BUG(*/ queue->n == 0 /*)*/) { + log_warn(LD_BUG, "Found a supposedly active circuit with no cells " + "to send. Trying to recover."); + circuitmux_set_num_cells(cmux, circ, 0); + if (! circ->marked_for_close) + circuit_mark_for_close(circ, END_CIRC_REASON_INTERNAL); + continue; + } + tor_assert(queue->n > 0); /*

1 0

[tor/release-0.2.8] LintChanges fix
by nickm＠torproject.org 22 Sep '16

22 Sep '16

commit d78711c0ae83c505a966791a18a6b8d5b7e4a8d1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 15:19:59 2016 -0400 LintChanges fix --- changes/bug20203 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug20203 b/changes/bug20203 index b4809ff..711c91b 100644 --- a/changes/bug20203 +++ b/changes/bug20203 @@ -1,4 +1,4 @@ - o Major bugfixes (relay, OOM handler) + o Major bugfixes (relay, OOM handler): - Fix a timing-dependent assertion failure that could occur when we tried to flush from a circuit after having freed its cells because of an out-of-memory condition. Fixes bug 20203; bugfix on

1 0

[tor/release-0.2.8] When clearing cells from a circuit for OOM reasons, tell cmux we did so.
by nickm＠torproject.org 22 Sep '16

22 Sep '16

commit e4aaf7666028c30866ad63053ad9f6eb6bf16bf7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 21 19:01:12 2016 -0400 When clearing cells from a circuit for OOM reasons, tell cmux we did so. Not telling the cmux would sometimes cause an assertion failure in relay.c when we tried to get an active circuit and found an "active" circuit with no cells. Additionally, replace that assert with a test and a log message. Fix for bug 20203. This is actually probably a bugfix on 0.2.8.1-alpha, specifically my code in 8b4e5b7ee902fb7fa0776 where I made circuit_mark_for_close_() do less in order to simplify our call graph. Thanks to "cypherpunks" for help diagnosing. --- changes/bug20203 | 6 ++++++ src/or/circuitlist.c | 10 ++++++++-- src/or/relay.c | 9 +++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/changes/bug20203 b/changes/bug20203 new file mode 100644 index 0000000..b4809ff --- /dev/null +++ b/changes/bug20203 @@ -0,0 +1,6 @@ + o Major bugfixes (relay, OOM handler) + - Fix a timing-dependent assertion failure that could occur when we + tried to flush from a circuit after having freed its cells because + of an out-of-memory condition. Fixes bug 20203; bugfix on + 0.2.8.1-alpha. Thanks to "cypherpunks" for help diagnosing this + one. diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 716024d..5fb8be5 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1836,8 +1836,14 @@ marked_circuit_free_cells(circuit_t *circ) return; } cell_queue_clear(&circ->n_chan_cells); - if (! CIRCUIT_IS_ORIGIN(circ)) - cell_queue_clear(& TO_OR_CIRCUIT(circ)->p_chan_cells); + if (circ->n_mux) + circuitmux_clear_num_cells(circ->n_mux, circ); + if (! CIRCUIT_IS_ORIGIN(circ)) { + or_circuit_t *orcirc = TO_OR_CIRCUIT(circ); + cell_queue_clear(&orcirc->p_chan_cells); + if (orcirc->p_mux) + circuitmux_clear_num_cells(orcirc->p_mux, circ); + } } static size_t diff --git a/src/or/relay.c b/src/or/relay.c index eddad6a..33191e1 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2619,6 +2619,15 @@ channel_flush_from_first_active_circuit, (channel_t *chan, int max)) } /* Circuitmux told us this was active, so it should have cells */ + if (/*BUG(*/ queue->n == 0 /*)*/) { + log_warn(LD_BUG, "Found a supposedly active circuit with no cells " + "to send. Trying to recover."); + circuitmux_set_num_cells(cmux, circ, 0); + if (! circ->marked_for_close) + circuit_mark_for_close(circ, END_CIRC_REASON_INTERNAL); + continue; + } + tor_assert(queue->n > 0); /*

1 0

[tor/master] Merge branch 'bug20203_027_squashed' into maint-0.2.8
by nickm＠torproject.org 22 Sep '16

22 Sep '16

commit 6e96eababe8f05ac03b2e83911e6fae5654884b4 Merge: 1edea87 e4aaf76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 15:17:00 2016 -0400 Merge branch 'bug20203_027_squashed' into maint-0.2.8 changes/bug20203 | 6 ++++++ src/or/circuitlist.c | 10 ++++++++-- src/or/relay.c | 9 +++++++++ 3 files changed, 23 insertions(+), 2 deletions(-)

1 0