tor-commits September 2017

tor-commits@lists.torproject.org

16 participants
2950 discussions

[tor/release-0.3.1] hs: Avoid possible double circuit close on error
by nickm＠torproject.org 22 Sep '17

22 Sep '17

commit dc5c9af6c383b97b47f86b3860e9693686bf0466 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Sep 21 13:13:44 2017 -0400 hs: Avoid possible double circuit close on error Fixes #23610 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23610 | 4 ++++ src/or/hs_intropoint.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug23610 b/changes/bug23610 new file mode 100644 index 000000000..f2dc8bd1a --- /dev/null +++ b/changes/bug23610 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service, relay): + - Avoid a possible double close of a circuit by the intro point on error + of sending the INTRO_ESTABLISHED cell. Fixes ticket 23610; bugfix on + 0.3.0.1-alpha. diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index e065ef64f..bc493e297 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -253,7 +253,11 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request, goto done; err: - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); + /* When sending the intro establish ack, on error the circuit can be marked + * as closed so avoid a double close. */ + if (!TO_CIRCUIT(circ)->marked_for_close) { + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); + } done: hs_cell_establish_intro_free(parsed_cell);

1 0

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

22 Sep '17

commit 9b02641812c05ef2fb0d3148aaee023d89fb9af8 Merge: 7f3dc8327 dc5c9af6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 22 09:09:17 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0

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

22 Sep '17

commit cce936aee07271717440f5538cbebf4fafb9e420 Merge: 91467e04b 9b0264181 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 22 09:09:17 2017 -0400 Merge branch 'maint-0.3.1'

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 22 Sep '17

22 Sep '17

1 0

[tor/release-0.3.0] hs: Avoid possible double circuit close on error
by nickm＠torproject.org 22 Sep '17

22 Sep '17

1 0

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

22 Sep '17

commit 2074984c34d346dec04614e2609c7694f8aa8aa7 Merge: e2ddc8b54 9b0264181 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 22 09:09:17 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1

1 0

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

22 Sep '17

commit 5df265ae55f8e7b056a34b1a9006c73a584cbe80 Merge: 2db94810b dc5c9af6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 22 09:09:17 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug23610 | 4 ++++ src/or/hs_intropoint.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/master] hs: Avoid possible double circuit close on error
by nickm＠torproject.org 22 Sep '17

22 Sep '17

1 0

[tor/master] changes file for bug22805
by nickm＠torproject.org 22 Sep '17

22 Sep '17

commit 6a75a6fd9a7cd9c60904388f6836e7e659ef60e6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 6 16:18:40 2017 -0400 changes file for bug22805 --- changes/bug22805 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/changes/bug22805 b/changes/bug22805 new file mode 100644 index 000000000..6d95ad5a3 --- /dev/null +++ b/changes/bug22805 @@ -0,0 +1,9 @@ + o Minor features (relay): + - When choosing which circuits can be expired as unused, consider + circuits from clients even if those clients used regular CREATE + cells to make them. Part of ticket 22805. + + o Code simplification and refactoring: + - Remove various ways of testing circuits and connections for + "clientness"; instead, favor channel_is_client(). + Part of ticket 22805.

1 0

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

22 Sep '17

commit 91467e04b18afce9af2189116ad0e160fef53e49 Merge: 512c57cff 95a7e7e92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 22 08:58:17 2017 -0400 Merge branch 'bug22805_v2_squashed' changes/bug22805 | 10 ++++++++++ src/or/channel.c | 16 +++++++++++++++- src/or/channel.h | 3 ++- src/or/channelpadding.c | 2 +- src/or/circuitbuild.c | 4 ++-- src/or/circuituse.c | 6 +++--- src/or/command.c | 12 +----------- src/or/connection_edge.c | 9 +++++---- src/or/or.h | 3 --- 9 files changed, 39 insertions(+), 26 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2017