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

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 16 May '18

16 May '18

commit d3a972561aeb38d7b346be1826054c60bf3adfaa Merge: 502d2c006 d1e4ffc71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:11:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/maint-0.2.9] Merge branch 'bug26072_029' into maint-0.2.9
by nickm＠torproject.org 16 May '18

16 May '18

commit d1e4ffc710fd6620614d4f7f20f6ed5d1c266ae4 Merge: 033e4723f 5eb2d5888 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:11:40 2018 -0400 Merge branch 'bug26072_029' into maint-0.2.9 changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 16 May '18

16 May '18

commit 69a6763b370c072c6b82f4175157323e801a0ef5 Merge: 6ac0ec566 d1e4ffc71 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:11:45 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'bug26072_029' into maint-0.2.9
by nickm＠torproject.org 16 May '18

16 May '18

commit d1e4ffc710fd6620614d4f7f20f6ed5d1c266ae4 Merge: 033e4723f 5eb2d5888 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:11:40 2018 -0400 Merge branch 'bug26072_029' into maint-0.2.9 changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.1] Add a missing return after marking a stream for bad connected cell
by nickm＠torproject.org 16 May '18

16 May '18

commit 5eb2d5888065420b44ad237d000dfb7c3656c2ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 15:54:48 2018 -0400 Add a missing return after marking a stream for bad connected cell Fixes bug 26072; bugfix on 0.2.4.7-alpha. --- changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+) diff --git a/changes/bug26072 b/changes/bug26072 new file mode 100644 index 000000000..2489e4fbb --- /dev/null +++ b/changes/bug26072 @@ -0,0 +1,5 @@ + o Minor bugfixes (correctness, client): + - Upon receiving a malformed connected cell, stop processing the cell + immediately. Previously we would mark the connection for close, but + continue processing the cell as if the connection were open. Fixes bug + 26072; bugfix on 0.2.4.7-alpha. diff --git a/src/or/relay.c b/src/or/relay.c index 22ce76752..1c791e02c 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1323,6 +1323,7 @@ connection_edge_process_relay_cell_not_open( "Got a badly formatted connected cell. Closing."); connection_edge_end(conn, END_STREAM_REASON_TORPROTOCOL); connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_TORPROTOCOL); + return 0; } if (tor_addr_family(&addr) != AF_UNSPEC) { const sa_family_t family = tor_addr_family(&addr);

1 0

[tor/release-0.2.9] Merge branch 'bug26072_029' into maint-0.2.9
by nickm＠torproject.org 16 May '18

16 May '18

commit d1e4ffc710fd6620614d4f7f20f6ed5d1c266ae4 Merge: 033e4723f 5eb2d5888 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:11:40 2018 -0400 Merge branch 'bug26072_029' into maint-0.2.9 changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 16 May '18

16 May '18

commit fcfa22d80a6ad97b3192bd25050b3988112c53c8 Merge: 4a5c1584f 3c4353179 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:11:46 2018 -0400 Merge branch 'maint-0.3.3' changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/release-0.2.9] Add a missing return after marking a stream for bad connected cell
by nickm＠torproject.org 16 May '18

16 May '18

commit 5eb2d5888065420b44ad237d000dfb7c3656c2ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 15:54:48 2018 -0400 Add a missing return after marking a stream for bad connected cell Fixes bug 26072; bugfix on 0.2.4.7-alpha. --- changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+) diff --git a/changes/bug26072 b/changes/bug26072 new file mode 100644 index 000000000..2489e4fbb --- /dev/null +++ b/changes/bug26072 @@ -0,0 +1,5 @@ + o Minor bugfixes (correctness, client): + - Upon receiving a malformed connected cell, stop processing the cell + immediately. Previously we would mark the connection for close, but + continue processing the cell as if the connection were open. Fixes bug + 26072; bugfix on 0.2.4.7-alpha. diff --git a/src/or/relay.c b/src/or/relay.c index 22ce76752..1c791e02c 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1323,6 +1323,7 @@ connection_edge_process_relay_cell_not_open( "Got a badly formatted connected cell. Closing."); connection_edge_end(conn, END_STREAM_REASON_TORPROTOCOL); connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_TORPROTOCOL); + return 0; } if (tor_addr_family(&addr) != AF_UNSPEC) { const sa_family_t family = tor_addr_family(&addr);

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 16 May '18

16 May '18

commit 8340f641c30f8e529b513732be2c931e128227e2 Merge: 4aa3d511b d3a972561 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:11:45 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 16 May '18

16 May '18

commit 3c4353179f2304767f5084734a7d1550f51f4542 Merge: 6acbd4c11 8340f641c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 16 12:11:45 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26072 | 5 +++++ src/or/relay.c | 1 + 2 files changed, 6 insertions(+)

1 0