tor-commits June 2018

tor-commits@lists.torproject.org

16 participants
2190 discussions

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

08 Jun '18

commit 1ef8023e000d9136b7069515f9d7303810a8f3b2 Merge: f48fb8a72 719b5c1d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 8 10:11:57 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26196 | 4 ++++ src/or/protover.c | 13 +++++++++++++ 2 files changed, 17 insertions(+)

1 0

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

08 Jun '18

commit 8dfd916a4b2481258f9f7b0afa13d16104d5339f Merge: 04eacc455 719b5c1d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 8 10:11:57 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug26196 | 4 ++++ src/or/protover.c | 13 +++++++++++++ 2 files changed, 17 insertions(+)

1 0

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

08 Jun '18

commit c27bb4072ca25b154e100158f819315bd8683ce0 Merge: fa1890e97 dd63033fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 8 10:11:57 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26196 | 4 ++++ src/or/protover.c | 13 +++++++++++++ 2 files changed, 17 insertions(+)

1 0

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

08 Jun '18

commit aef0607f3810ef47f0b13b5ed1d553578940dd7c Merge: 3716ddf1b c27bb4072 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 8 10:11:57 2018 -0400 Merge branch 'maint-0.3.3' changes/bug26196 | 4 ++++ src/or/protover.c | 13 +++++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/release-0.2.9] Avoid out-of-bounds smartlist access in protover_compute_vote()
by nickm＠torproject.org 08 Jun '18

08 Jun '18

commit 719b5c1d27c678d4c2c705a8e4942b0f93070bdc Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Jun 4 12:27:10 2018 +0300 Avoid out-of-bounds smartlist access in protover_compute_vote() and contract_protocol_list() --- changes/bug26196 | 4 ++++ src/or/protover.c | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/changes/bug26196 b/changes/bug26196 new file mode 100644 index 000000000..47fcffa0f --- /dev/null +++ b/changes/bug26196 @@ -0,0 +1,4 @@ + o Minor bugfixes (hardening): + - Prevent a possible out-of-bounds smartlist read in + protover_compute_vote(). Fixes bug 26196; bugfix on + 0.2.9.4-alpha. diff --git a/src/or/protover.c b/src/or/protover.c index 0c79037f6..31ca13fe6 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -453,6 +453,10 @@ cmp_single_ent_by_version(const void **a_, const void **b_) static char * contract_protocol_list(const smartlist_t *proto_strings) { + if (smartlist_len(proto_strings) == 0) { + return tor_strdup(""); + } + // map from name to list of single-version entries strmap_t *entry_lists_by_name = strmap_new(); // list of protocol names @@ -561,6 +565,10 @@ char * protover_compute_vote(const smartlist_t *list_of_proto_strings, int threshold) { + if (smartlist_len(list_of_proto_strings) == 0) { + return tor_strdup(""); + } + smartlist_t *all_entries = smartlist_new(); // First, parse the inputs and break them into singleton entries. @@ -587,6 +595,11 @@ protover_compute_vote(const smartlist_t *list_of_proto_strings, smartlist_free(unexpanded); } SMARTLIST_FOREACH_END(vote); + if (smartlist_len(all_entries) == 0) { + smartlist_free(all_entries); + return tor_strdup(""); + } + // Now sort the singleton entries smartlist_sort_strings(all_entries);

1 0

[tor/release-0.3.1] Avoid out-of-bounds smartlist access in protover_compute_vote()
by nickm＠torproject.org 08 Jun '18

08 Jun '18

1 0

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

08 Jun '18

1 0

[tor/release-0.3.2] Avoid out-of-bounds smartlist access in protover_compute_vote()
by nickm＠torproject.org 08 Jun '18

08 Jun '18

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 08 Jun '18

08 Jun '18

commit 14ec62f0640df3007e442e937428f2839f1eb745 Merge: 432620e44 dd63033fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 8 10:11:57 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug26196 | 4 ++++ src/or/protover.c | 13 +++++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 08 Jun '18

08 Jun '18

commit dd63033fcbb960ac563a8f417a7f65e62781d9a9 Merge: 3f3739c6e 1ef8023e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 8 10:11:57 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26196 | 4 ++++ src/or/protover.c | 13 +++++++++++++ 2 files changed, 17 insertions(+)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2018