July 2011 - tor-commits - lists.torproject.org

[tor/maint-0.2.2] Fix a rare memory leak in rend_cache_store
by nickm＠torproject.org 01 Jul '11

01 Jul '11

commit 46297bc7bd86826fa79195f36059ce408ef45b6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 11:52:39 2011 -0400 Fix a rare memory leak in rend_cache_store When we rejected a descriptor for not being the one we wanted, we were letting the parsed descriptor go out of scope. Found by Coverity; CID # 30. Bugfix on 0.2.1.26. (No changes file yet, since this is not in any 0.2.1.x release.) --- src/or/rendcommon.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 8727a70..e0c101e 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1077,6 +1077,7 @@ rend_cache_store(const char *desc, size_t desc_len, int published, log_warn(LD_REND, "Received service descriptor for service ID %s; " "expected descriptor for service ID %s.", query, safe_str(service_id)); + rend_service_descriptor_free(parsed); return -2; } now = time(NULL);

1 0

[tor/maint-0.2.2] Fix insanely large stack_allocation in log_credential_status
by nickm＠torproject.org 01 Jul '11

01 Jul '11

commit d25feadebbf05d6fce55cfee1e3c8f928903f543 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 12:36:33 2011 -0400 Fix insanely large stack_allocation in log_credential_status I'm not one to insist on C's miserly stack limits, but allocating a 256K array on the stack is too much even for me. Bugfix on 0.2.1.7-alpha. Found by coverity. Fixes CID # 450. --- changes/cid_450 | 5 +++++ src/common/compat.c | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/changes/cid_450 b/changes/cid_450 new file mode 100644 index 0000000..2045fca --- /dev/null +++ b/changes/cid_450 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Don't stack-allocate the list of supplementary GIDs when we're + about to log them. Stack-allocating NGROUPS_MAX gid_t elements + could take up to 256K, which is way too much stack. Found by + Coverity; CID #450. Bugfix on 0.2.1.7-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index 3965108..9533c11 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1080,7 +1080,8 @@ log_credential_status(void) /* Read, effective and saved GIDs */ gid_t rgid, egid, sgid; /* Supplementary groups */ - gid_t sup_gids[NGROUPS_MAX + 1]; + gid_t *sup_gids = NULL; + int sup_gids_size; /* Number of supplementary groups */ int ngids; @@ -1126,9 +1127,19 @@ log_credential_status(void) #endif /* log supplementary groups */ - if ((ngids = getgroups(NGROUPS_MAX + 1, sup_gids)) < 0) { + sup_gids_size = 64; + sup_gids = tor_malloc(sizeof(gid_t) * 64); + while ((ngids = getgroups(sup_gids_size, sup_gids)) < 0 && + errno == EINVAL && + sup_gids_size < NGROUPS_MAX) { + sup_gids_size *= 2; + sup_gids = tor_realloc(sup_gids, sizeof(gid_t) * sup_gids_size); + } + + if (ngids < 0) { log_warn(LD_GENERAL, "Error getting supplementary GIDs: %s", strerror(errno)); + tor_free(sup_gids); return -1; } else { int i, retval = 0; @@ -1158,6 +1169,7 @@ log_credential_status(void) tor_free(cp); }); smartlist_free(elts); + tor_free(sup_gids); return retval; }

1 0

[tor/maint-0.2.1] Merge branches 'cov217_021' and 'cid_450' into maint-0.2.1
by nickm＠torproject.org 01 Jul '11

01 Jul '11

commit 021cf3f0521375f1722a7fb82ce286086db79142 Merge: 959da6b d25fead Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 12:54:51 2011 -0400 Merge branches 'cov217_021' and 'cid_450' into maint-0.2.1 changes/cid_450 | 5 +++++ src/common/compat.c | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.1] Use strlcpy in create_unix_sockaddr()
by nickm＠torproject.org 01 Jul '11

01 Jul '11

commit 959da6b7f2b5ed63426fd12a9046ac06033f6db1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 12:06:54 2011 -0400 Use strlcpy in create_unix_sockaddr() Using strncpy meant that if listenaddress were ever >= sizeof(sockaddr_un.sun_path), we would fail to nul-terminate sun_path. This isn't a big deal: we never read sun_path, and the kernel is smart enough to reject the sockaddr_un if it isn't nul-terminated. Nonetheless, it's a dumb failure mode. Instead, we should reject addresses that don't fit in sockaddr_un.sun_path. Coverity found this; it's CID 428. Bugfix on 0.2.0.3-alpha. --- changes/cid_428 | 5 +++++ src/or/connection.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/changes/cid_428 b/changes/cid_428 new file mode 100644 index 0000000..cb0fc8c --- /dev/null +++ b/changes/cid_428 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Always NUL-terminate the sun_path field of a sockaddr_un before + passing it to the kernel. (Not a security issue: kernels are + smart enough to reject bad sockaddr_uns.) Found by Coverity; CID + # 428. Bugfix on Tor 0.2.0.3-alpha. diff --git a/src/or/connection.c b/src/or/connection.c index 4869a24..2897fe1 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -804,7 +804,13 @@ create_unix_sockaddr(const char *listenaddress, char **readable_address, sockaddr = tor_malloc_zero(sizeof(struct sockaddr_un)); sockaddr->sun_family = AF_UNIX; - strncpy(sockaddr->sun_path, listenaddress, sizeof(sockaddr->sun_path)); + if (strlcpy(sockaddr->sun_path, listenaddress, sizeof(sockaddr->sun_path)) + >= sizeof(sockaddr->sun_path)) { + log_warn(LD_CONFIG, "Unix socket path '%s' is too long to fit.", + escaped(listenaddress)); + tor_free(sockaddr); + return NULL; + } if (readable_address) *readable_address = tor_strdup(listenaddress);

1 0

[tor/maint-0.2.1] Fix a rare memory leak in rend_cache_store
by nickm＠torproject.org 01 Jul '11

01 Jul '11

commit 46297bc7bd86826fa79195f36059ce408ef45b6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 11:52:39 2011 -0400 Fix a rare memory leak in rend_cache_store When we rejected a descriptor for not being the one we wanted, we were letting the parsed descriptor go out of scope. Found by Coverity; CID # 30. Bugfix on 0.2.1.26. (No changes file yet, since this is not in any 0.2.1.x release.) --- src/or/rendcommon.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 8727a70..e0c101e 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1077,6 +1077,7 @@ rend_cache_store(const char *desc, size_t desc_len, int published, log_warn(LD_REND, "Received service descriptor for service ID %s; " "expected descriptor for service ID %s.", query, safe_str(service_id)); + rend_service_descriptor_free(parsed); return -2; } now = time(NULL);

1 0

[tor/maint-0.2.1] Fix insanely large stack_allocation in log_credential_status
by nickm＠torproject.org 01 Jul '11

01 Jul '11

commit d25feadebbf05d6fce55cfee1e3c8f928903f543 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 12:36:33 2011 -0400 Fix insanely large stack_allocation in log_credential_status I'm not one to insist on C's miserly stack limits, but allocating a 256K array on the stack is too much even for me. Bugfix on 0.2.1.7-alpha. Found by coverity. Fixes CID # 450. --- changes/cid_450 | 5 +++++ src/common/compat.c | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/changes/cid_450 b/changes/cid_450 new file mode 100644 index 0000000..2045fca --- /dev/null +++ b/changes/cid_450 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Don't stack-allocate the list of supplementary GIDs when we're + about to log them. Stack-allocating NGROUPS_MAX gid_t elements + could take up to 256K, which is way too much stack. Found by + Coverity; CID #450. Bugfix on 0.2.1.7-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index 3965108..9533c11 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1080,7 +1080,8 @@ log_credential_status(void) /* Read, effective and saved GIDs */ gid_t rgid, egid, sgid; /* Supplementary groups */ - gid_t sup_gids[NGROUPS_MAX + 1]; + gid_t *sup_gids = NULL; + int sup_gids_size; /* Number of supplementary groups */ int ngids; @@ -1126,9 +1127,19 @@ log_credential_status(void) #endif /* log supplementary groups */ - if ((ngids = getgroups(NGROUPS_MAX + 1, sup_gids)) < 0) { + sup_gids_size = 64; + sup_gids = tor_malloc(sizeof(gid_t) * 64); + while ((ngids = getgroups(sup_gids_size, sup_gids)) < 0 && + errno == EINVAL && + sup_gids_size < NGROUPS_MAX) { + sup_gids_size *= 2; + sup_gids = tor_realloc(sup_gids, sizeof(gid_t) * sup_gids_size); + } + + if (ngids < 0) { log_warn(LD_GENERAL, "Error getting supplementary GIDs: %s", strerror(errno)); + tor_free(sup_gids); return -1; } else { int i, retval = 0; @@ -1158,6 +1169,7 @@ log_credential_status(void) tor_free(cp); }); smartlist_free(elts); + tor_free(sup_gids); return retval; }

1 0

r24853: {website} bump the suggested donation to $10 to continue the experimen (website/trunk/download/en)
by Andrew Lewman 01 Jul '11

01 Jul '11

Author: phobos Date: 2011-07-01 01:31:19 +0000 (Fri, 01 Jul 2011) New Revision: 24853 Modified: website/trunk/download/en/download-easy.wml Log: bump the suggested donation to $10 to continue the experiment. Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2011-07-01 01:30:33 UTC (rev 24852) +++ website/trunk/download/en/download-easy.wml 2011-07-01 01:31:19 UTC (rev 24853) @@ -70,7 +70,7 @@ <option value="GBP">£</option> <option value="YEN">¥</option> </select> - <input type="text" id="amount" class="amount" name="amount" value="5" size="10"> + <input type="text" id="amount" class="amount" name="amount" value="10" size="10"> </p> <p> <input type="hidden" id="a3" name="a3" value="0">

1 0

r24852: {website} bump the suggested donation to $10 to continue the experimen (website/trunk/download/en)
by Andrew Lewman 01 Jul '11

01 Jul '11

Author: phobos Date: 2011-07-01 01:30:33 +0000 (Fri, 01 Jul 2011) New Revision: 24852 Modified: website/trunk/download/en/download.wml Log: bump the suggested donation to $10 to continue the experiment. Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-06-29 22:53:57 UTC (rev 24851) +++ website/trunk/download/en/download.wml 2011-07-01 01:30:33 UTC (rev 24852) @@ -63,7 +63,7 @@ <option value="GBP">£</option> <option value="YEN">¥</option> </select> - <input type="text" id="amount" class="amount" name="amount" value="5" size="10"> + <input type="text" id="amount" class="amount" name="amount" value="10" size="10"> </p> <p> <input type="hidden" id="a3" name="a3" value="0">

1 0

[torbutton/master] Optimize SafeCache pref lookup a bit.
by mikeperry＠torproject.org 01 Jul '11

01 Jul '11

commit 8788ca4dfe6f10484e41028e150cba69f3097779 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Jun 30 17:51:08 2011 -0700 Optimize SafeCache pref lookup a bit. Also allow 3rd party caching by default. --- src/chrome/content/stanford-safecache.js | 40 +++++++++++++++--------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js index fe5e087..bd67652 100644 --- a/src/chrome/content/stanford-safecache.js +++ b/src/chrome/content/stanford-safecache.js @@ -115,8 +115,8 @@ SSC_RequestListener.prototype = // Same-origin policy var referrer; if (parent && parent.hostname != channel.URI.host) { - //SSC_dump("Segmenting " + channel.URI.host + - //" content loaded by " + parent.host); + SSC_dump("Segmenting " + channel.URI.host + + " content loaded by " + parent.host); this.setCacheKey(channel, parent.hostname); referrer = parent.hostname; } else { @@ -124,15 +124,16 @@ SSC_RequestListener.prototype = if(!this.readCacheKey(channel.cacheKey)) { this.setCacheKey(channel, channel.URI.host); } else { - // SSC_dump("Existing cache key detected; leaving it unchanged."); + SSC_dump("Existing cache key detected; leaving it unchanged."); } } - // Always apply policy - if(parent && parent.hostname != channel.URI.host) { - //SSC_dump("Third party cache blocked for " + channel.URI.spec + - //" content loaded by " + parent.spec); - this.bypassCache(channel); + if (this.controller.getBlockThirdPartyCache()) { + if(parent && parent.hostname != channel.URI.host) { + //SSC_dump("Third party cache blocked for " + channel.URI.spec + + //" content loaded by " + parent.spec); + this.bypassCache(channel); + } } var cookie = null; @@ -311,33 +312,32 @@ SSC_RequestListener.prototype = * Master control object. Adds and removes the RequestListener */ function SSC_Controller() { + this.prefs = Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefService); this.addListener(new SSC_RequestListener(this)); } SSC_Controller.prototype = { getEnabled: function() { - return (Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService) - .getIntPref(kSSC_ENABLED_PREF)); + return (this.prefs.getIntPref(kSSC_ENABLED_PREF)); }, getSafeCookieEnabled: function() { - return (Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService) - .getBoolPref(kSSC_SC_ENABLED_PREF)); + return (this.prefs.getBoolPref(kSSC_SC_ENABLED_PREF)); + }, + + getBlockThirdPartyCache: function() { + // Meh, no pref for now. Always allow. + return false; }, getTorButton: function() { - return (Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch) - .getBoolPref(kSSC_TORBUTTON_PREF)); + return (this.prefs.getBoolPref(kSSC_TORBUTTON_PREF)); }, getCookieJS: function() { - return (Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch) - .getBoolPref(kSSC_COOKIE_JS_PREF)); + return (this.prefs.getBoolPref(kSSC_COOKIE_JS_PREF)); }, addListener: function(listener) {

1 0

[torbutton/master] Demote safecache logging.
by mikeperry＠torproject.org 01 Jul '11

01 Jul '11

commit 5153669f97a2fb51034b86bc43c3a2063156b10b Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Jun 30 17:55:31 2011 -0700 Demote safecache logging. --- src/chrome/content/stanford-safecache.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js index bd67652..3daed58 100644 --- a/src/chrome/content/stanford-safecache.js +++ b/src/chrome/content/stanford-safecache.js @@ -42,7 +42,7 @@ var SSC_debug = true; */ function SSC_dump(msg) { if (SSC_debug) - torbutton_log(3, "SSC: " + msg); + torbutton_log(2, "SSC: " + msg); } ////////////////////////////////////////////////////////////////////////////

1 0