- tor-commits - lists.torproject.org

[tor/maint-0.2.1] Make SIZE_T_CEILING unsigned; add a signed SSIZE_T_CEILING
by nickm＠torproject.org 28 Apr '11

28 Apr '11

commit 43ffd023e9267927539dc9c12bee86199cd1c800 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 13:00:46 2011 -0400 Make SIZE_T_CEILING unsigned; add a signed SSIZE_T_CEILING None of the comparisons were _broken_ previously, but avoiding signed/unsigned comparisons makes everybody happier. Fixes bug2475. --- changes/bug2475 | 5 +++++ src/common/crypto.c | 2 +- src/common/torint.h | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug2475 b/changes/bug2475 new file mode 100644 index 0000000..d6f0595 --- /dev/null +++ b/changes/bug2475 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Avoid signed/unsigned comparisons by making SIZE_T_CEILING unsigned. + (None of the cases where we did this before were wrong, but by making + this change we can avoid warnings.) Fixes bug2475; bugfix on + Tor 0.2.1.28. diff --git a/src/common/crypto.c b/src/common/crypto.c index 48c8dea..838347e 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -452,7 +452,7 @@ crypto_pk_read_private_key_from_string(crypto_pk_env_t *env, tor_assert(env); tor_assert(s); - tor_assert(len < INT_MAX && len < SIZE_T_CEILING); + tor_assert(len < INT_MAX && len < SSIZE_T_CEILING); /* Create a read-only memory BIO, backed by the string 's' */ b = BIO_new_mem_buf((char*)s, (int)len); diff --git a/src/common/torint.h b/src/common/torint.h index 2a9fba6..d489684 100644 --- a/src/common/torint.h +++ b/src/common/torint.h @@ -330,8 +330,10 @@ typedef uint32_t uintptr_t; #endif #endif +/* Any ssize_t larger than this amount is likely to be an underflow. */ +#define SSIZE_T_CEILING ((ssize_t)(SSIZE_T_MAX-16)) /* Any size_t larger than this amount is likely to be an underflow. */ -#define SIZE_T_CEILING (SSIZE_T_MAX-16) +#define SIZE_T_CEILING ((size_t)(SSIZE_T_MAX-16)) #endif /* __TORINT_H */

1 0

r24687: {projects} Clarify a paragraph. (projects/articles/browser-privacy)
by Mike Perry 27 Apr '11

27 Apr '11

Author: mikeperry Date: 2011-04-27 22:12:07 +0000 (Wed, 27 Apr 2011) New Revision: 24687 Modified: projects/articles/browser-privacy/W3CIdentity.tex Log: Clarify a paragraph. Modified: projects/articles/browser-privacy/W3CIdentity.tex =================================================================== --- projects/articles/browser-privacy/W3CIdentity.tex 2011-04-27 21:33:27 UTC (rev 24686) +++ projects/articles/browser-privacy/W3CIdentity.tex 2011-04-27 22:12:07 UTC (rev 24687) @@ -131,11 +131,11 @@ utilize everything they can to build complete portraits of users' identities~\cite{tracking-identity}. -Despite what the user may believe, her actual web identity then is a -superset of all the stored identifiers and authentication tokens used by the -browser. This identity can link a user's activity in one instance to her -activity in another instance, be it across time, or even on the very same page -due to multiple content origins. +Despite what the user may believe, her actual web identity then is a superset +of all stored identifiers and authentication tokens used by the browser. This +identity can link a user's activity in one instance to her activity in another +instance, be it across time, or even on a single page due to common prevalent +third-party content origins. Therefore, instead of viewing the user's identity as the sum of her identifiers, or as her relationship to individual websites, it is best to

1 0

r24686: {projects} 5 pages it is! (projects/articles/browser-privacy)
by Mike Perry 27 Apr '11

27 Apr '11

Author: mikeperry Date: 2011-04-27 21:33:27 +0000 (Wed, 27 Apr 2011) New Revision: 24686 Modified: projects/articles/browser-privacy/usenix.sty Log: 5 pages it is! Modified: projects/articles/browser-privacy/usenix.sty =================================================================== --- projects/articles/browser-privacy/usenix.sty 2011-04-27 15:26:04 UTC (rev 24685) +++ projects/articles/browser-privacy/usenix.sty 2011-04-27 21:33:27 UTC (rev 24686) @@ -24,16 +24,16 @@ % 0.25" gutter between columns. % Gives active areas of 6.75" x 9.25" % -\setlength{\textheight}{9.0in} +\setlength{\textheight}{9.25in} \setlength{\columnsep}{0.25in} -\setlength{\textwidth}{6.75in} +\setlength{\textwidth}{7.00in} %\setlength{\textwidth}{7.00in} -%\setlength{\footheight}{0.0in} +%\setlength{\footheight}{0.00in} \setlength{\topmargin}{-0.25in} \setlength{\headheight}{0.0in} \setlength{\headsep}{0.0in} -\setlength{\evensidemargin}{-0.125in} -\setlength{\oddsidemargin}{-0.125in} +\setlength{\evensidemargin}{-0.25in} +\setlength{\oddsidemargin}{-0.25in} % % Usenix wants no page numbers for submitted papers, so that they can

1 0

[tor/master] Fix clear_trackhostexits_mapping() to actually work as advertised
by nickm＠torproject.org 27 Apr '11

27 Apr '11

commit 34510f9278675e6e041503e425ca19a1fa0f3616 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 27 17:21:41 2011 -0400 Fix clear_trackhostexits_mapping() to actually work as advertised Previously, it would remove every trackhostexits-derived mapping *from* xyz.<exitname>.exit; it was supposed to remove every trackhostexits-derived mapping *to* xyz.<exitname>.exit. Bugfix on 0.2.0.20-rc: fixes an XXX020 added while staring at bug-1090 issues. --- changes/clear_trackexithost | 5 +++++ src/or/connection_edge.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/clear_trackexithost b/changes/clear_trackexithost new file mode 100644 index 0000000..701d369 --- /dev/null +++ b/changes/clear_trackexithost @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix a bug in the code where we could keep trying to use a + TrackHostExits-based mapping after we failed to reach the intended + destination node. Bugfix on 0.2.0.20-rc. + diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 082cd5f..2c1196c 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -799,8 +799,8 @@ clear_trackexithost_mappings(const char *exitname) tor_strlower(suffix); STRMAP_FOREACH_MODIFY(addressmap, address, addressmap_entry_t *, ent) { - /* XXXX022 HEY! Shouldn't this look at ent->new_address? */ - if (ent->source == ADDRMAPSRC_TRACKEXIT && !strcmpend(address, suffix)) { + if (ent->source == ADDRMAPSRC_TRACKEXIT && + !strcmpend(ent->new_address, suffix)) { addressmap_ent_remove(address, ent); MAP_DEL_CURRENT(address); }

1 0

[tor/master] I guess that had a bug number: add it to the changes file.
by nickm＠torproject.org 27 Apr '11

27 Apr '11

commit 7f85509a59b88173ac6060cd5925e28415f016b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 27 17:26:28 2011 -0400 I guess that had a bug number: add it to the changes file. --- changes/clear_trackexithost | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/changes/clear_trackexithost b/changes/clear_trackexithost index 701d369..b9ac6fe 100644 --- a/changes/clear_trackexithost +++ b/changes/clear_trackexithost @@ -1,5 +1,5 @@ o Minor bugfixes: - Fix a bug in the code where we could keep trying to use a TrackHostExits-based mapping after we failed to reach the intended - destination node. Bugfix on 0.2.0.20-rc. + destination node. Fixes bug 2999. Bugfix on 0.2.0.20-rc.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 27 Apr '11

27 Apr '11

commit 26c022ecbcbf4fb4541c4103b5fc94831d50d92b Merge: d4a61c7 7f85509 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 27 17:26:40 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/clear_trackexithost | 5 +++++ src/or/connection_edge.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.2] I guess that had a bug number: add it to the changes file.
by nickm＠torproject.org 27 Apr '11

27 Apr '11

commit 7f85509a59b88173ac6060cd5925e28415f016b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 27 17:26:28 2011 -0400 I guess that had a bug number: add it to the changes file. --- changes/clear_trackexithost | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/changes/clear_trackexithost b/changes/clear_trackexithost index 701d369..b9ac6fe 100644 --- a/changes/clear_trackexithost +++ b/changes/clear_trackexithost @@ -1,5 +1,5 @@ o Minor bugfixes: - Fix a bug in the code where we could keep trying to use a TrackHostExits-based mapping after we failed to reach the intended - destination node. Bugfix on 0.2.0.20-rc. + destination node. Fixes bug 2999. Bugfix on 0.2.0.20-rc.

1 0

[tor/maint-0.2.2] Fix clear_trackhostexits_mapping() to actually work as advertised
by nickm＠torproject.org 27 Apr '11

27 Apr '11

commit 34510f9278675e6e041503e425ca19a1fa0f3616 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 27 17:21:41 2011 -0400 Fix clear_trackhostexits_mapping() to actually work as advertised Previously, it would remove every trackhostexits-derived mapping *from* xyz.<exitname>.exit; it was supposed to remove every trackhostexits-derived mapping *to* xyz.<exitname>.exit. Bugfix on 0.2.0.20-rc: fixes an XXX020 added while staring at bug-1090 issues. --- changes/clear_trackexithost | 5 +++++ src/or/connection_edge.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/clear_trackexithost b/changes/clear_trackexithost new file mode 100644 index 0000000..701d369 --- /dev/null +++ b/changes/clear_trackexithost @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix a bug in the code where we could keep trying to use a + TrackHostExits-based mapping after we failed to reach the intended + destination node. Bugfix on 0.2.0.20-rc. + diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 082cd5f..2c1196c 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -799,8 +799,8 @@ clear_trackexithost_mappings(const char *exitname) tor_strlower(suffix); STRMAP_FOREACH_MODIFY(addressmap, address, addressmap_entry_t *, ent) { - /* XXXX022 HEY! Shouldn't this look at ent->new_address? */ - if (ent->source == ADDRMAPSRC_TRACKEXIT && !strcmpend(address, suffix)) { + if (ent->source == ADDRMAPSRC_TRACKEXIT && + !strcmpend(ent->new_address, suffix)) { addressmap_ent_remove(address, ent); MAP_DEL_CURRENT(address); }

1 0

[tor/release-0.2.2] fold in more changelog entries
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit 79d55f60068cf3415e2d6d43cfa1aef93972d40d Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 27 17:04:04 2011 -0400 fold in more changelog entries --- ChangeLog | 26 ++++++++++++++++---------- changes/microdesc-double-free | 7 ------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 684a917..5f73d3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,21 @@ Changes in version 0.2.2.25-alpha - 2011-04-28 Also, resume reading bandwidth history from the state file correctly. Fixes bug 2704; bugfix on tor-0.2.2.23-alpha. + o Security and stability fixes: + - Don't double-free a parsable, but invalid, microdescriptor, even + if it is followed in the blob we're parsing by an unparsable + microdescriptor. Fixes an issue reported in a comment on bug 2954. + Bugfix on 0.2.2.6-alpha; fix by "cypherpunks". + - If the Nickname configuration option isn't given, Tor would pick + a nickname based on the local hostname as the nickname for a relay. + Because nicknames are not very important in today's Tor and the + "Unnamed" nickname has been implemented, this is now problematic + behavior: It leaks information about the hostname without being + useful at all. Bugfix on 0.1.2.2-alpha, which introduced the + Unnamed nickname. Fixes bug 2979, reported by tagnaq. + - Fix an uncommon assertion failure when running with DNSPort under + heavy load. Fixes bug 2933; bugfix on 2.0.1-alpha. + o Major features: - Export GeoIP information on bridge usage to controller even if we have not yet been running for 24 hours. Now Vidalia bridge @@ -74,20 +89,13 @@ Changes in version 0.2.2.25-alpha - 2011-04-28 o Minor bugfixes: - Added a forgotten cast that caused a compile warning on OS X 10.6. Bugfix on 0.2.2.24-alpha. - - If the Nickname configuration option isn't given, Tor would pick - a nickname based on the local hostname as the nickname for a relay. - Because nicknames are not very important in today's Tor and the - "Unnamed" nickname has been implemented, this is now problematic - behavior: It leaks information about the hostname without being - useful at all. Bugfix on 0.1.2.2-alpha, which introduced the - Unnamed nickname. Fixes bug 2979, reported by tagnaq. - Be more careful about reporting the correct error from a failed connect() system call. Under some circumstances, it was possible to look at an incorrect value for errno when sending the end reason. Bugfix on 0.1.0.1-rc. - Correctly handle an "impossible" overflow cases in connection byte counting, where we write or read more than 4GB on an edge - connection in single second. Bugfix on 0.1.2.8-beta. + connection in a single second. Bugfix on 0.1.2.8-beta. - When a client finds that an origin circuit has run out of 16-bit stream IDs, we now mark it as unusable for new streams. Previously, we would try to close the entire circuit. Bugfix on 0.0.6. @@ -98,8 +106,6 @@ Changes in version 0.2.2.25-alpha - 2011-04-28 Notice to Info. Fixes bug 2899; bugfix on 0.2.0.10-alpha. - Make the SIGNAL DUMP control-port command work on FreeBSD. Fixes bug 2917. Bugfix on 0.1.1.1-alpha. - - Fix an uncommon assertion failure when running with DNSPort under - heavy load. Fixes bug 2933; bugfix on 2.0.1-alpha. - Only limit the lengths of single HS descriptors, even when multiple HS descriptors are published to an HSDir relay in a single POST operation. Fixes bug 2948; bugfix on 0.2.1.5-alpha. diff --git a/changes/microdesc-double-free b/changes/microdesc-double-free deleted file mode 100644 index 932cc75..0000000 --- a/changes/microdesc-double-free +++ /dev/null @@ -1,7 +0,0 @@ - o Security fixes: - - Don't double-free a parsable, but invalid, microdescriptor, even - if it is followed in the blob we're parsing by an unparsable - microdescriptor. Fixes an issue reported in a comment on bug 2954. - Bugfix on 0.2.2.6-alpha; fix by "cypherpunks". - -

1 0

[tor/release-0.2.2] Fix double-free bug in microdesc parser
by arma＠torproject.org 27 Apr '11

27 Apr '11

commit 247cbab6c8a37c5e6225bfd60491b071a29331e4 Author: cypherpunks <writecode(a)127.0.0.1> Date: Wed Apr 27 11:10:56 2011 -0700 Fix double-free bug in microdesc parser --- changes/microdesc-double-free | 7 +++++++ src/or/routerparse.c | 1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/microdesc-double-free b/changes/microdesc-double-free new file mode 100644 index 0000000..932cc75 --- /dev/null +++ b/changes/microdesc-double-free @@ -0,0 +1,7 @@ + o Security fixes: + - Don't double-free a parsable, but invalid, microdescriptor, even + if it is followed in the blob we're parsing by an unparsable + microdescriptor. Fixes an issue reported in a comment on bug 2954. + Bugfix on 0.2.2.6-alpha; fix by "cypherpunks". + + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index ba29f05..d0138e6 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4357,6 +4357,7 @@ microdescs_parse_from_string(const char *s, const char *eos, md = NULL; next: microdesc_free(md); + md = NULL; memarea_clear(area); smartlist_clear(tokens);

1 0