- tor-commits - lists.torproject.org

[tor/release-0.2.7] a couple more changes files issues.
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit 920e3d6a191486a5879aa0f2e0bfcf743d075c12 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 21 11:00:50 2016 -0400 a couple more changes files issues. --- changes/bug14821 | 2 +- changes/bug17906 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/bug14821 b/changes/bug14821 index e017eff..e9ccc2f 100644 --- a/changes/bug14821 +++ b/changes/bug14821 @@ -1,4 +1,4 @@ o Major bugfixes (compilation): - - Correctly repair hardened builds under the clang compiler. Previously, + - Repair hardened builds under the clang compiler. Previously, our use of _FORTIFY_SOURCE would conflict with clang's address sanitizer. Fixes bug 14821; bugfix on 0.2.5.4-alpha. diff --git a/changes/bug17906 b/changes/bug17906 index 4b97740..2937369 100644 --- a/changes/bug17906 +++ b/changes/bug17906 @@ -1,4 +1,4 @@ - o Minor features (authorities): + o Major features (authorities): - Update the V3 identity key for the dannenberg authority, which changed on 18 November 2015. Closes task 17906. Patch by "teor".

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit 443dddb74966eea0b30231b9f18b80b9372f2210 Merge: 740421a 21f9829 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 9 10:36:35 2016 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-march2016 | 4 + src/config/geoip | 8496 +++++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2270 ++++++------- 3 files changed, 6524 insertions(+), 4246 deletions(-)

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit 17cfdb358cae63477a120182784599dae0538cd7 Merge: 67e5d49 443dddb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 9 10:36:50 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-march2016 | 4 + src/config/geoip | 8496 +++++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2270 ++++++------- 3 files changed, 6524 insertions(+), 4246 deletions(-)

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.7' into release-0.2.7
by nickm＠torproject.org 21 Mar '16

21 Mar '16

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit 21f9829e793fd9074c568ffffbee548e345536df Merge: ce289e2 8e2640b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 9 10:36:20 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-march2016 | 4 + src/config/geoip | 8496 +++++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2270 ++++++------- 3 files changed, 6524 insertions(+), 4246 deletions(-)

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit ce289e2cb5099a4abe4468049dc0d262b65bfa17 Merge: f06d9a9 ad95d64 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 11 12:55:40 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug18162 | 7 +++++++ src/common/container.c | 29 +++++++++++++++++++---------- 2 files changed, 26 insertions(+), 10 deletions(-)

1 0

[tor/release-0.2.7] Merge branch 'bug18162_024' into maint-0.2.4
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit ad95d64fece2c6d2eddffc8fa5178c3ffccc0cd7 Merge: d5ac79e c2fd648 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 11 12:55:25 2016 -0500 Merge branch 'bug18162_024' into maint-0.2.4 changes/bug18162 | 7 +++++++ src/common/container.c | 29 +++++++++++++++++++---------- 2 files changed, 26 insertions(+), 10 deletions(-)

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit 740421af194b890c24242a834ed03ffc5c4c16ab Merge: 44ad3be ce289e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 11 12:57:28 2016 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug18162 | 7 +++++++ src/common/container.c | 37 ++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --cc src/common/container.c index 864fd8a,c668068..76c129d --- a/src/common/container.c +++ b/src/common/container.c @@@ -66,28 -71,22 +71,25 @@@ smartlist_ensure_capacity(smartlist_t * #define MAX_CAPACITY (INT_MAX) #else #define MAX_CAPACITY (int)((SIZE_MAX / (sizeof(void*)))) - #define ASSERT_CAPACITY #endif - if (size > sl->capacity) { - int higher = sl->capacity; ++ + tor_assert(size <= MAX_CAPACITY); + + if (size > (size_t) sl->capacity) { + size_t higher = (size_t) sl->capacity; if (PREDICT_UNLIKELY(size > MAX_CAPACITY/2)) { - #ifdef ASSERT_CAPACITY - /* We don't include this assertion when MAX_CAPACITY == INT_MAX, - * since int size; (size <= INT_MAX) makes analysis tools think we're - * doing something stupid. */ -- tor_assert(size <= MAX_CAPACITY); - #endif higher = MAX_CAPACITY; } else { while (size > higher) higher *= 2; } - sl->capacity = higher; + tor_assert(higher <= INT_MAX); /* Redundant */ + sl->capacity = (int) higher; - sl->list = tor_realloc(sl->list, sizeof(void*)*((size_t)sl->capacity)); + sl->list = tor_reallocarray(sl->list, sizeof(void *), + ((size_t)sl->capacity)); } +#undef ASSERT_CAPACITY +#undef MAX_CAPACITY } /** Append element to the end of the list. */

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit be6174f8f6aaaf8f990eb56c5cba16bc5ec0fcea Merge: d920cbb 740421a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 11 13:01:46 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug18162 | 7 +++++++ src/common/container.c | 37 ++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 17 deletions(-)

1 0

[tor/release-0.2.7] Make clang asan work with FORTIFIED_SOURCE again.
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit 67e5d49d8a995c6d3b8bf4177046271a7d4dd157 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 14:07:58 2016 -0500 Make clang asan work with FORTIFIED_SOURCE again. Short version: clang asan hates the glibc strcmp macro in bits/string2.h if you are passing it a constant string argument of length two or less. (I could be off by one here, but that's the basic idea.) Closes issue 14821. --- changes/bug14821 | 4 ++++ src/common/compat.h | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/changes/bug14821 b/changes/bug14821 new file mode 100644 index 0000000..0920d1f --- /dev/null +++ b/changes/bug14821 @@ -0,0 +1,4 @@ + o Major bugfixes (compilation): + - Correctly repair hardened builds under the clang compiler. Previously, + our use of _FORTIFY_SOURCE would conflict with clang's address + sanitizer. Closes ticket 14821. diff --git a/src/common/compat.h b/src/common/compat.h index c7c468c..66cc079 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -42,6 +42,15 @@ #include <netinet6/in6.h> #endif +#if defined(__has_feature) +# if __has_feature(address_sanitizer) +/* Some of the fancy glibc strcmp() macros include references to memory that + * clang rejects because it is off the end of a less-than-3. Clang hates this, + * even though those references never actually happen. */ +# undef strcmp +# endif +#endif + #include <stdio.h> #include <errno.h>

1 0