tor-commits July 2011

tor-commits@lists.torproject.org

16 participants
868 discussions

[tor/master] Don't shadow parameters with local variables
by nickm＠torproject.org 01 Jul '11

01 Jul '11

commit 1d18c2deb6d048a8d6f726e6c1b8ccbab4374e32 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 11:33:07 2011 -0400 Don't shadow parameters with local variables This is a little error-prone when the local has a different type from the parameter, and is very error-prone with both have the same type. Let's not do this. Fixes CID #437,438,439,440,441. --- src/or/directory.c | 6 +++--- src/or/eventdns.c | 4 ++-- src/or/policies.c | 14 +++++++------- src/or/relay.c | 8 ++++---- src/or/routerparse.c | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 7ded115..9e1373d 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2592,7 +2592,7 @@ client_likes_consensus(networkstatus_t *v, const char *want_url) * Always return 0. */ static int directory_handle_command_get(dir_connection_t *conn, const char *headers, - const char *body, size_t body_len) + const char *req_body, size_t req_body_len) { size_t dlen; char *url, *url_mem, *header; @@ -2602,8 +2602,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, size_t url_len; /* We ignore the body of a GET request. */ - (void)body; - (void)body_len; + (void)req_body; + (void)req_body_len; log_debug(LD_DIRSERV,"Received GET command."); diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 321b7d7..7fe376b 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -1831,8 +1831,8 @@ evdns_server_request_respond(struct evdns_server_request *_req, int err) r = sendto(port->socket, req->response, req->response_len, 0, (struct sockaddr*) &req->addr, req->addrlen); if (r<0) { - int err = last_error(port->socket); - if (! error_is_eagain(err)) + int error = last_error(port->socket); + if (! error_is_eagain(error)) return -1; if (port->pending_replies) { diff --git a/src/or/policies.c b/src/or/policies.c index 983df86..1b5408c 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -83,15 +83,15 @@ policy_expand_private(smartlist_t **policy) continue; } for (i = 0; private_nets[i]; ++i) { - addr_policy_t policy; - memcpy(&policy, p, sizeof(addr_policy_t)); - policy.is_private = 0; - policy.is_canonical = 0; - if (tor_addr_parse_mask_ports(private_nets[i], &policy.addr, - &policy.maskbits, &port_min, &port_max)<0) { + addr_policy_t newpolicy; + memcpy(&newpolicy, p, sizeof(addr_policy_t)); + newpolicy.is_private = 0; + newpolicy.is_canonical = 0; + if (tor_addr_parse_mask_ports(private_nets[i], &newpolicy.addr, + &newpolicy.maskbits, &port_min, &port_max)<0) { tor_assert(0); } - smartlist_add(tmp, addr_policy_get_canonical_entry(&policy)); + smartlist_add(tmp, addr_policy_get_canonical_entry(&newpolicy)); } addr_policy_free(p); }); diff --git a/src/or/relay.c b/src/or/relay.c index d647b18..df6d0a8 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2337,13 +2337,13 @@ connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max, /* Calculate the exact time that this cell has spent in the queue. */ if (get_options()->CellStatistics && !CIRCUIT_IS_ORIGIN(circ)) { - struct timeval now; + struct timeval tvnow; uint32_t flushed; uint32_t cell_waiting_time; insertion_time_queue_t *it_queue = queue->insertion_times; - tor_gettimeofday_cached(&now); - flushed = (uint32_t)((now.tv_sec % SECONDS_IN_A_DAY) * 100L + - (uint32_t)now.tv_usec / (uint32_t)10000L); + tor_gettimeofday_cached(&tvnow); + flushed = (uint32_t)((tvnow.tv_sec % SECONDS_IN_A_DAY) * 100L + + (uint32_t)tvnow.tv_usec / (uint32_t)10000L); if (!it_queue || !it_queue->first) { log_info(LD_GENERAL, "Cannot determine insertion time of cell. " "Looks like the CellStatistics option was " diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 67b238e..d1b2cd0 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3512,10 +3512,10 @@ networkstatus_parse_detached_signatures(const char *s, const char *eos) siglist = detached_get_signatures(sigs, flavor); is_duplicate = 0; - SMARTLIST_FOREACH(siglist, document_signature_t *, s, { - if (s->alg == alg && - tor_memeq(id_digest, s->identity_digest, DIGEST_LEN) && - tor_memeq(sk_digest, s->signing_key_digest, DIGEST_LEN)) { + SMARTLIST_FOREACH(siglist, document_signature_t *, dsig, { + if (dsig->alg == alg && + tor_memeq(id_digest, dsig->identity_digest, DIGEST_LEN) && + tor_memeq(sk_digest, dsig->signing_key_digest, DIGEST_LEN)) { is_duplicate = 1; } });

1 0

[tor/master] Defensive programming: don't crash with broken node_t
by nickm＠torproject.org 01 Jul '11

01 Jul '11

commit eca982d3eb1e715394b2c67d8f420bcbe4a8486d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 11:43:34 2011 -0400 Defensive programming: don't crash with broken node_t Every node_t has either a routerinfo_t or a routerstatus_t, so every node_t *should* have a nickname. Nonetheless, let's make sure in hex_digest_nickname_matches(). Should quiet CID 434. --- src/or/routerlist.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index f711282..15f643c 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2274,6 +2274,8 @@ hex_digest_nickname_matches(const char *hexdigest, const char *identity_digest, return 0; if (nn_char == '=' || nn_char == '~') { + if (!nickname) + return 0; if (strcasecmp(nn_buf, nickname)) return 0; if (nn_char == '=' && !is_named)

1 0

[tor/master] Replace a "const const" with a "const"
by nickm＠torproject.org 01 Jul '11

01 Jul '11

commit da62af6f6b369592609d2da43b82abde0bbccfac Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 11:11:35 2011 -0400 Replace a "const const" with a "const" Looks like this squeaked in while I was doing a search-and-replace to constify things. Coverity CID 483. --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index df5cc86..bb335dd 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2367,7 +2367,7 @@ options_trial_assign(config_line_t *list, int use_defaults, * Called from option_reset() and config_free(). */ static void option_clear(const config_format_t *fmt, or_options_t *options, - const const config_var_t *var) + const config_var_t *var) { void *lvalue = STRUCT_VAR_P(options, var->var_offset); (void)fmt; /* unused */

1 0

[tor/maint-0.2.2] 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.2] Use strlcpy when copying node IDs into measured_bw_line_t
by nickm＠torproject.org 01 Jul '11

01 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/maint-0.2.2] Merge branch 'cov217_022_squashed' into maint-0.2.2
by nickm＠torproject.org 01 Jul '11

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

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

01 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/maint-0.2.2] 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.2] Add a changelog entry for cid30 fix.
by nickm＠torproject.org 01 Jul '11

01 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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2011