- tor-commits - lists.torproject.org

[tor/release-0.2.2] Use strlcpy in create_unix_sockaddr()
by arma＠torproject.org 06 Jul '11

06 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/release-0.2.2] Fix a rare memory leak in rend_cache_store
by arma＠torproject.org 06 Jul '11

06 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/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 06 Jul '11

06 Jul '11

commit 2ba19f9b4a052dcaa5ebd3c6a629e1ec67a595f9 Merge: 2b5ebc7 021cf3f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 12:55:23 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/cid_428 | 5 +++++ changes/cid_450 | 5 +++++ src/common/compat.c | 16 ++++++++++++++-- src/or/connection.c | 8 +++++++- src/or/rendcommon.c | 1 + 5 files changed, 32 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.2] Merge branches 'cov217_021' and 'cid_450' into maint-0.2.1
by arma＠torproject.org 06 Jul '11

06 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/release-0.2.2] Merge branch 'cid30_changelog' into maint-0.2.2
by arma＠torproject.org 06 Jul '11

06 Jul '11

commit 5cf725e3c691ac3e5674ce64bd2be410a9cb0ede Merge: 2ba19f9 359a30d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 12:55:27 2011 -0400 Merge branch 'cid30_changelog' into maint-0.2.2 changes/memleak_rendcache | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)

1 0

[tor/release-0.2.2] Merge branch 'cov217_022_squashed' into maint-0.2.2
by arma＠torproject.org 06 Jul '11

06 Jul '11

commit 06f0c1aa6a4ad0a6dfc93b1637214c307feed566 Merge: 5cf725e bc91cb6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 12:56:14 2011 -0400 Merge branch 'cov217_022_squashed' into maint-0.2.2 src/or/dirserv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Use strlcpy when copying node IDs into measured_bw_line_t
by arma＠torproject.org 06 Jul '11

06 Jul '11

commit bc91cb6e459042e11be11e50050ac086fdcb33dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 12:14:44 2011 -0400 Use strlcpy when copying node IDs into measured_bw_line_t We were using strncpy before, which isn't our style for stuff like this. This isn't a bug, though: before calling strncpy, we were checking that strlen(src) was indeed == HEX_DIGEST_LEN, which is less than sizeof(dst), so there was no way we could fail to NUL-terminate. Still, strncpy(a,b,sizeof(a)) is an idiom that we ought to squash everyplace. Fixes CID #427. --- src/or/dirserv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index d114d86..7df9a2f 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2415,7 +2415,7 @@ measured_bw_line_parse(measured_bw_line_t *out, const char *orig_line) tor_free(line); return -1; } - strncpy(out->node_hex, cp, sizeof(out->node_hex)); + strlcpy(out->node_hex, cp, sizeof(out->node_hex)); got_node_id=1; } } while ((cp = tor_strtok_r(NULL, " \t", &strtok_state)));

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'rransom-tor/bug3465-022' into maint-0.2.2
by arma＠torproject.org 06 Jul '11

06 Jul '11

commit 335ff915c7a509eb1b76e67f88c7b65d20032035 Merge: 06f0c1a 93d52f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 15:52:11 2011 -0400 Merge remote-tracking branch 'rransom-tor/bug3465-022' into maint-0.2.2 changes/bug3465-022 | 6 ++++++ src/or/circuitbuild.c | 10 +++++----- src/or/circuitlist.c | 2 +- src/or/control.c | 3 ++- 4 files changed, 14 insertions(+), 7 deletions(-)

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 06 Jul '11

06 Jul '11

commit 01fdd676ea8f8ec494776163f07a5d28f48375b1 Merge: f0ba3c1 335ff91 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Jul 6 00:13:47 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug3465-022 | 6 ++++++ changes/cid_428 | 5 +++++ changes/cid_450 | 5 +++++ changes/memleak_rendcache | 4 ++++ doc/HACKING | 22 +++++++++++++--------- src/common/compat.c | 18 +++++++++++++++--- src/common/container.c | 5 +++-- src/or/circuitbuild.c | 10 +++++----- src/or/circuitlist.c | 2 +- src/or/connection.c | 14 ++++++++++---- src/or/control.c | 3 ++- src/or/dirserv.c | 2 +- src/or/or.h | 6 +++--- src/or/rendcommon.c | 1 + src/test/Makefile.am | 2 +- src/test/tinytest_demo.c | 2 +- 16 files changed, 76 insertions(+), 31 deletions(-)

1 0

[tor/release-0.2.2] explain that the ./publish should happen soon after the scp
by arma＠torproject.org 06 Jul '11

06 Jul '11

commit b181985a8f98c0ba15230912f059e1fcf7c626f1 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jun 21 00:37:18 2011 -0400 explain that the ./publish should happen soon after the scp otherwise you scp a tarball up but only one version of the website has it. --- doc/HACKING | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index 7ff9c5f..feeb05d 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -456,7 +456,6 @@ interesting and understandable. 2.7) Run it through fmt to make it pretty. - 3) Compose a short release blurb to highlight the user-facing changes. Insert said release blurb into the ChangeLog stanza. If it's a stable release, add it to the ReleaseNotes file too. If we're adding @@ -472,15 +471,19 @@ or somebody to try building it on Windows. 6) Get at least two of weasel/arma/karsten to put the new version number in their approved versions list. -7) Sign and push the tarball to the website in the dist/ directory. Sign -and push the git tag. - (That's either "git tag -u <keyid> tor-0.2.x.y-status", then - "git push origin tag tor-0.2.x.y-status". To sign the - tarball, "gpg -ba <the_tarball>". Put the files in - /srv/www-master.torproject.org/htdocs/dist/ on vescum.) +7) Sign the tarball, then sign and push the git tag: + gpg -ba <the_tarball> + git tag -u <keyid> tor-0.2.x.y-status + git push origin tag tor-0.2.x.y-status + +8) scp the tarball and its sig to the website in the dist/ directory +(i.e. /srv/www-master.torproject.org/htdocs/dist/ on vescum). Edit +include/versions.wmi to note the new version. From your website checkout, +run ./publish to build and publish the website. -8) Edit include/versions.wmi to note the new version. From your website -checkout, run ./publish to build and publish the website. +Try not to delay too much between scp'ing the tarball and running +./publish -- the website has multiple A records and your scp only sent +it to one of them. 9) Email Erinn and weasel (cc'ing tor-assistants) that a new tarball is up. This step should probably change to mailing more packagers. @@ -498,3 +501,4 @@ changelog to tor-talk or tor-announce. (We might be moving to faster announcements, but don't announce until the website is at least updated.) +

1 0