March 2015 - tor-commits - lists.torproject.org

[torbutton/master] Bug #15207: Check first if bridge.ID exists before using it
by gk＠torproject.org 10 Mar '15

10 Mar '15

commit 9714d5a8abfcc19c6c5667a8c4e3b7d064401df0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Mar 9 17:24:05 2015 -0700 Bug #15207: Check first if bridge.ID exists before using it --- src/chrome/content/tor-circuit-display.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index e2628b4..bcda03a 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -55,7 +55,7 @@ let trimQuotes = s => s ? s.match(/^\"(.*)\"$/)[1] : undefined; let getBridge = function* (controller, id) { let bridges = yield controller.getConf("bridge"); for (let bridge of bridges) { - if (bridge.ID.toUpperCase() === id.toUpperCase()) { + if (bridge.ID && bridge.ID.toUpperCase() === id.toUpperCase()) { return bridge; } }

1 0

[webwml/master] 0.2.6 is now 0.2.6.4-rc
by nickm＠torproject.org 10 Mar '15

10 Mar '15

commit 2cfe5bca050a8dee9e29ac2e692cac2ca11cc1e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 21:40:41 2015 -0400 0.2.6 is now 0.2.6.4-rc --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7cc2fda..a28fe2b 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.2.5.10 -export DEVTAG=tor-0.2.6.3-alpha +export DEVTAG=tor-0.2.6.4-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index f448298..53f74e3 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.5.10</define-tag> -<define-tag version-alpha whitespace=delete>0.2.6.3-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.6.4-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.5.10</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.5.10</define-tag>

1 0

[tor/release-0.2.6] Fold more into the 0.2.6.4-rc changelog
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 0c2e4aec7b8b2024a93c2ee5a7d97bdc45501f70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 19:52:10 2015 -0400 Fold more into the 0.2.6.4-rc changelog --- ChangeLog | 10 ++++++++++ changes/bug15205 | 5 ----- changes/geoip-march2015 | 3 --- changes/geoip6-march2015 | 3 --- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index e77a0c4..def84f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ Changes in version 0.2.6.4-rc - 2015-03-09 directories. It also resolves some minor issues left over from, or introduced in, Tor 0.2.6.3-alpha or earlier. + o Major bugfixes (crash, OSX, security): + - Fix a remote denial-of-service opportunity caused by a bug in + OSX's _strlcat_chk() function. Fixes bug 15205; bug first appeared + in OSX 10.9. + o Major bugfixes (relay, stability, possible security): - Fix a bug that could lead to a relay crashing with an assertion failure if a buffer of exactly the wrong layout is passed to @@ -33,6 +38,11 @@ Changes in version 0.2.6.4-rc - 2015-03-09 information about the server we were trying to connect to when we noticed the problem. Closes ticket 15006. + o Minor features (geoip): + - Update geoip to the March 3 2015 Maxmind GeoLite2 Country database. + - Update geoip6 to the March 3 2015 Maxmind GeoLite2 + Country database. + o Minor features (logs): - Quiet some log messages in the heartbeat and at startup. Closes ticket 14950. diff --git a/changes/bug15205 b/changes/bug15205 deleted file mode 100644 index 0cb9f3f..0000000 --- a/changes/bug15205 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes (crash, OSX, security): - - Fix a remote denial-of-service opportunity caused by a bug - in OSX's _strlcat_chk() function. Fixes bug 15205; bug first - appeared in OSX 10.9. - diff --git a/changes/geoip-march2015 b/changes/geoip-march2015 deleted file mode 100644 index 5657812..0000000 --- a/changes/geoip-march2015 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip to the March 3 2015 Maxmind GeoLite2 Country database. - diff --git a/changes/geoip6-march2015 b/changes/geoip6-march2015 deleted file mode 100644 index 9a38c65..0000000 --- a/changes/geoip6-march2015 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update geoip6 to the March 3 2015 Maxmind GeoLite2 Country database. -

1 0

[tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit ff1f6c417c53d905f47f26ea6b0fa90888857a8c Merge: 5e5b82f 1af67d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 19:47:28 2015 -0400 Merge branch 'maint-0.2.6' into release-0.2.6 changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/release-0.2.6] Don't use checked strl{cat, cpy} on OSX.
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 24c031b1a28658c921a746f4d58f3ca5e9994108 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 15:09:49 2015 -0400 Don't use checked strl{cat,cpy} on OSX. There is a bug in the overlap-checking in strlcat that can crash Tor servers. Fixes bug 15205; this is an OSX bug, not a Tor bug. --- changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/changes/bug15205 b/changes/bug15205 new file mode 100644 index 0000000..0cb9f3f --- /dev/null +++ b/changes/bug15205 @@ -0,0 +1,5 @@ + o Major bugfixes (crash, OSX, security): + - Fix a remote denial-of-service opportunity caused by a bug + in OSX's _strlcat_chk() function. Fixes bug 15205; bug first + appeared in OSX 10.9. + diff --git a/src/common/compat.h b/src/common/compat.h index ec7d241..531e88f 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -224,6 +224,18 @@ extern INLINE double U64_TO_DBL(uint64_t x) { #define strncasecmp _strnicmp #define strcasecmp _stricmp #endif + +#if defined __APPLE__ +/* On OSX 10.9 and later, the overlap-checking code for strlcat would + * appear to have a severe bug that can sometimes cause aborts in Tor. + * Instead, use the non-checking variants. This is sad. + * + * See https://trac.torproject.org/projects/tor/ticket/15205 + */ +#undef strlcat +#undef strlcpy +#endif + #ifndef HAVE_STRLCAT size_t strlcat(char *dst, const char *src, size_t siz) ATTR_NONNULL((1,2)); #endif

1 0

[tor/release-0.2.6] Fix a couple of changelog issues noted by arma.
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 5e5b82febba1ca904abc59863115f0f4b325fdad Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 19:46:55 2015 -0400 Fix a couple of changelog issues noted by arma. --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a20d556..e77a0c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,9 +6,9 @@ Changes in version 0.2.6.4-rc - 2015-03-09 o Major bugfixes (relay, stability, possible security): - Fix a bug that could lead to a relay crashing with an assertion - failure if a buffer of exactly the wrong layout was passed to + failure if a buffer of exactly the wrong layout is passed to buf_pullup() at exactly the wrong time. Fixes bug 15083; bugfix on - 0.2.0.10-alpha. Patch from 'cypherpunks'. + 0.2.0.10-alpha. Patch from "cypherpunks". - Do not assert if the 'data' pointer on a buffer is advanced to the very end of the buffer; log a BUG message instead. Only assert if it is past that point. Fixes bug 15083; bugfix on 0.2.0.10-alpha.

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 1af67d7f72470cec1de5e2a75186edc3b3accfbe Merge: 7c9be64 24c031b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 19:47:12 2015 -0400 Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6 changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/maint-0.2.6] Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 1af67d7f72470cec1de5e2a75186edc3b3accfbe Merge: 7c9be64 24c031b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 19:47:12 2015 -0400 Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6 changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ 2 files changed, 17 insertions(+)

1 0

[tor/maint-0.2.6] Don't use checked strl{cat, cpy} on OSX.
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 24c031b1a28658c921a746f4d58f3ca5e9994108 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 15:09:49 2015 -0400 Don't use checked strl{cat,cpy} on OSX. There is a bug in the overlap-checking in strlcat that can crash Tor servers. Fixes bug 15205; this is an OSX bug, not a Tor bug. --- changes/bug15205 | 5 +++++ src/common/compat.h | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/changes/bug15205 b/changes/bug15205 new file mode 100644 index 0000000..0cb9f3f --- /dev/null +++ b/changes/bug15205 @@ -0,0 +1,5 @@ + o Major bugfixes (crash, OSX, security): + - Fix a remote denial-of-service opportunity caused by a bug + in OSX's _strlcat_chk() function. Fixes bug 15205; bug first + appeared in OSX 10.9. + diff --git a/src/common/compat.h b/src/common/compat.h index ec7d241..531e88f 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -224,6 +224,18 @@ extern INLINE double U64_TO_DBL(uint64_t x) { #define strncasecmp _strnicmp #define strcasecmp _stricmp #endif + +#if defined __APPLE__ +/* On OSX 10.9 and later, the overlap-checking code for strlcat would + * appear to have a severe bug that can sometimes cause aborts in Tor. + * Instead, use the non-checking variants. This is sad. + * + * See https://trac.torproject.org/projects/tor/ticket/15205 + */ +#undef strlcat +#undef strlcpy +#endif + #ifndef HAVE_STRLCAT size_t strlcat(char *dst, const char *src, size_t siz) ATTR_NONNULL((1,2)); #endif

1 0

[tor/master] Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 220e9be0959241ce5ea36f64bc08245292a6b06c Merge: 5588e67 6271406 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 16:24:07 2015 -0400 Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4 changes/geoip6-march2015 | 3 + src/config/geoip6 | 1228 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 1013 insertions(+), 218 deletions(-)

1 0