- tor-commits - lists.torproject.org

[tor/release-0.2.2] Improve documentation of smartlist_split_string
by arma＠torproject.org 06 Jul '11

06 Jul '11

commit 2b5ebc70973b1c0dd62201908632733c0953a4ec Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Jun 22 13:47:32 2011 -0700 Improve documentation of smartlist_split_string --- src/common/container.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/container.c b/src/common/container.c index da44b7f..1515c38 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -338,7 +338,8 @@ smartlist_insert(smartlist_t *sl, int idx, void *val) /** * Split a string str along all occurrences of sep, - * adding the split strings, in order, to sl. + * appending the (newly allocated) split strings, in order, to + * sl. Return the number of strings added to sl. * * If flags&SPLIT_SKIP_SPACE is true, remove initial and * trailing space from each entry. @@ -347,7 +348,7 @@ smartlist_insert(smartlist_t *sl, int idx, void *val) * If flags&SPLIT_STRIP_SPACE is true, strip spaces from each * split string. * - * If max>0, divide the string into no more than max pieces. If + * If max\>0, divide the string into no more than max pieces. If * sep is NULL, split on any sequence of horizontal space. */ int

1 0

[tor/release-0.2.2] Fix minor comment issues
by arma＠torproject.org 06 Jul '11

06 Jul '11

commit cb1b20dbad2ee346a814b30d5dc72a3dc93069e5 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 23 15:10:11 2011 -0700 Fix minor comment issues --- src/or/circuitbuild.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6d7e711..1140f33 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1501,7 +1501,7 @@ get_unique_circ_id_by_conn(or_connection_t *conn) } /** If verbose is false, allocate and return a comma-separated list of - * the currently built elements of circuit_t. If verbose is true, also + * the currently built elements of circ. If verbose is true, also * list information about link status in a more verbose format using spaces. * If verbose_names is false, give nicknames for Named routers and hex * digests for others; if verbose_names is true, use $DIGEST=Name style @@ -1590,7 +1590,7 @@ circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names) } /** If verbose is false, allocate and return a comma-separated - * list of the currently built elements of circuit_t. If + * list of the currently built elements of circ. If * verbose is true, also list information about link status in * a more verbose format using spaces. */ @@ -1601,7 +1601,7 @@ circuit_list_path(origin_circuit_t *circ, int verbose) } /** Allocate and return a comma-separated list of the currently built elements - * of circuit_t, giving each as a verbose nickname. + * of circ, giving each as a verbose nickname. */ char * circuit_list_path_for_controller(origin_circuit_t *circ) @@ -1610,7 +1610,7 @@ circuit_list_path_for_controller(origin_circuit_t *circ) } /** Log, at severity severity, the nicknames of each router in - * circ's cpath. Also log the length of the cpath, and the intended + * circ's cpath. Also log the length of the cpath, and the intended * exit point. */ void @@ -1622,7 +1622,7 @@ circuit_log_path(int severity, unsigned int domain, origin_circuit_t *circ) } /** Tell the rep(utation)hist(ory) module about the status of the links - * in circ. Hops that have become OPEN are marked as successfully + * in circ. Hops that have become OPEN are marked as successfully * extended; the _first_ hop that isn't open (if any) is marked as * unable to extend. */

1 0

[tor/release-0.2.2] Correct a comment
by arma＠torproject.org 06 Jul '11

06 Jul '11

commit 53f87a89f00d075bdc81c2c468e844f3132ef953 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Jun 24 15:12:45 2011 -0700 Correct a comment --- src/or/circuitlist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 8534c38..e9cc9eb 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -866,7 +866,7 @@ circuit_unlink_all_from_or_conn(or_connection_t *conn, int reason) } /** Return a circ such that: - * - circ-\>rend_data-\>query is equal to rend_query, and + * - circ-\>rend_data-\>onion_address is equal to rend_query, and * - circ-\>purpose is equal to purpose. * * Return NULL if no such circuit exists.

1 0

[tor/release-0.2.2] Add BUILDTIMEOUT_SET to the result of GETINFO events/names
by arma＠torproject.org 06 Jul '11

06 Jul '11

commit 93d52f6739d3bb184575aa53eab1562d2c80ee57 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Jun 25 15:02:11 2011 -0700 Add BUILDTIMEOUT_SET to the result of GETINFO events/names --- changes/bug3465-022 | 6 ++++++ src/or/control.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/changes/bug3465-022 b/changes/bug3465-022 new file mode 100644 index 0000000..2d22616 --- /dev/null +++ b/changes/bug3465-022 @@ -0,0 +1,6 @@ + o Minor bugfixes: + + - Add BUILDTIMEOUT_SET to the list returned by the 'GETINFO + events/names' control-port command. Bugfix on 0.2.2.9-alpha; + fixes part of bug 3465. + diff --git a/src/or/control.c b/src/or/control.c index 82017bd..da0a95d 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1380,7 +1380,8 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, *answer = tor_strdup("CIRC STREAM ORCONN BW DEBUG INFO NOTICE WARN ERR " "NEWDESC ADDRMAP AUTHDIR_NEWDESCS DESCCHANGED " "NS STATUS_GENERAL STATUS_CLIENT STATUS_SERVER " - "GUARD STREAM_BW CLIENTS_SEEN NEWCONSENSUS"); + "GUARD STREAM_BW CLIENTS_SEEN NEWCONSENSUS " + "BUILDTIMEOUT_SET"); } else if (!strcmp(question, "features/names")) { *answer = tor_strdup("VERBOSE_NAMES EXTENDED_EVENTS"); } else if (!strcmp(question, "address")) {

1 0

[tor/release-0.2.2] Fix insanely large stack_allocation in log_credential_status
by arma＠torproject.org 06 Jul '11

06 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/release-0.2.2] Add a changelog entry for cid30 fix.
by arma＠torproject.org 06 Jul '11

06 Jul '11

commit 359a30d52e01e6413a052f03b7067c40b10336d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 12:46:26 2011 -0400 Add a changelog entry for cid30 fix. --- changes/memleak_rendcache | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/memleak_rendcache b/changes/memleak_rendcache new file mode 100644 index 0000000..93b1f61 --- /dev/null +++ b/changes/memleak_rendcache @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a memory leak when receiving a descriptor for a hidden + service we didn't ask for. Found by Coverity; CID#30. Bugfix on + 0.2.2.26-beta.

1 0

[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