April 2013 - tor-commits - lists.torproject.org

[tor/master] Don't leak a waiting-for-certs consensus when accepting it.
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit cd2b508f4ec22e85104065058722293a951be200 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 17 11:53:52 2013 -0400 Don't leak a waiting-for-certs consensus when accepting it. I believe this was introduced in 6bc071f765d2829249db52, which makes this a fix on 0.2.0.10-alpha. But my code archeology has not extended to actually testing that theory. --- changes/bug8719 | 6 ++++++ src/or/networkstatus.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug8719 b/changes/bug8719 new file mode 100644 index 0000000..c05b79d --- /dev/null +++ b/changes/bug8719 @@ -0,0 +1,6 @@ + o Major bugfixes (memory leak): + - Avoid a memory leak where we would leak a consensus body when we find + that a consensus which we couldn't previously verify due to missing + certificates is now verifiable. Fixes bug 8719; bugfix on + 0.2.0.10-alpha. + diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 2553a74..b78fed3 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1893,11 +1893,12 @@ networkstatus_note_certs_arrived(void) if (!waiting->consensus) continue; if (networkstatus_check_consensus_signature(waiting->consensus, 0)>=0) { + char *waiting_body = waiting->body; if (!networkstatus_set_current_consensus( - waiting->body, + waiting_body, networkstatus_get_flavor_name(i), NSSET_WAS_WAITING_FOR_CERTS)) { - tor_free(waiting->body); + tor_free(waiting_body); } } }

1 0

[tor/master] Merge remote-tracking branch 'public/bug8719' into maint-0.2.4
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit 06efbbb47ef28dd24cb4482f5b82204918891f41 Merge: 9fec0c1 cd2b508 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 18 11:26:54 2013 -0400 Merge remote-tracking branch 'public/bug8719' into maint-0.2.4 changes/bug8719 | 6 ++++++ src/or/networkstatus.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit 1b5320bfe3d178c20357b9860087147a6cbb099b Merge: da30adc 06efbbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 18 11:28:11 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8719 | 6 ++++++ src/or/networkstatus.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.4] Don't leak a waiting-for-certs consensus when accepting it.
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit cd2b508f4ec22e85104065058722293a951be200 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 17 11:53:52 2013 -0400 Don't leak a waiting-for-certs consensus when accepting it. I believe this was introduced in 6bc071f765d2829249db52, which makes this a fix on 0.2.0.10-alpha. But my code archeology has not extended to actually testing that theory. --- changes/bug8719 | 6 ++++++ src/or/networkstatus.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/bug8719 b/changes/bug8719 new file mode 100644 index 0000000..c05b79d --- /dev/null +++ b/changes/bug8719 @@ -0,0 +1,6 @@ + o Major bugfixes (memory leak): + - Avoid a memory leak where we would leak a consensus body when we find + that a consensus which we couldn't previously verify due to missing + certificates is now verifiable. Fixes bug 8719; bugfix on + 0.2.0.10-alpha. + diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 2553a74..b78fed3 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1893,11 +1893,12 @@ networkstatus_note_certs_arrived(void) if (!waiting->consensus) continue; if (networkstatus_check_consensus_signature(waiting->consensus, 0)>=0) { + char *waiting_body = waiting->body; if (!networkstatus_set_current_consensus( - waiting->body, + waiting_body, networkstatus_get_flavor_name(i), NSSET_WAS_WAITING_FOR_CERTS)) { - tor_free(waiting->body); + tor_free(waiting_body); } } }

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug8719' into maint-0.2.4
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit 06efbbb47ef28dd24cb4482f5b82204918891f41 Merge: 9fec0c1 cd2b508 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 18 11:26:54 2013 -0400 Merge remote-tracking branch 'public/bug8719' into maint-0.2.4 changes/bug8719 | 6 ++++++ src/or/networkstatus.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)

1 0

[torspec/master] control-spec: CACHED keyword for ADDRMAP events is quoted (#8596)
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit ed7730dc1aa14910955b41c6650c66d70a04e03c Author: Desoxy <desoxy(a)fastmail.fm> Date: Sat Apr 13 06:59:40 2013 +0200 control-spec: CACHED keyword for ADDRMAP events is quoted (#8596) The CACHED keyword is always quoted, I simply forgot to add it to the specification. Caught and patched by atagar, thanks! --- control-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 4498fbe..4b05692 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1588,7 +1588,7 @@ ErrorCode = "yes" / "internal" / "Unable to launch resolve request" UTCExpiry = DQUOTE IsoTime DQUOTE - Cached = "YES" / "NO" + Cached = DQUOTE "YES" DQUOTE / DQUOTE "NO" DQUOTE Error and UTCExpiry are only provided if extended events are enabled. The values for Error are mostly useless. Future values will be

1 0

[torspec/master] Merge remote-tracking branch 'desoxy/bug-8596'
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit fc9eef8d890a4fc97883411db819bc8565a909b7 Merge: 920edee ed7730d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 18 11:22:23 2013 -0400 Merge remote-tracking branch 'desoxy/bug-8596' control-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/master] Refactor format_networkstatus_vote to avoid preallocating a buffer.
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit 9f044eac77ee2245de71283e71361346ee194f25 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 20 00:36:59 2013 -0500 Refactor format_networkstatus_vote to avoid preallocating a buffer. This saves a lot of "are we about to overrun the buffer?" checking, and unmoots a bunch of "did we allocate enough" discussion. --- src/or/dirvote.c | 138 ++++++++++++++++++----------------------------------- 1 files changed, 47 insertions(+), 91 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index bcfe2b0..bd4e2f6 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -67,17 +67,15 @@ char * format_networkstatus_vote(crypto_pk_t *private_signing_key, networkstatus_t *v3_ns) { - size_t len; - char *status = NULL; + smartlist_t *chunks; const char *client_versions = NULL, *server_versions = NULL; - char *outp, *endp; char fingerprint[FINGERPRINT_LEN+1]; char digest[DIGEST_LEN]; uint32_t addr; - routerlist_t *rl = router_get_routerlist(); - char *version_lines = NULL; - int r; + char *client_versions_line = NULL, *server_versions_line = NULL; networkstatus_voter_info_t *voter; + char *status = NULL; + size_t status_len; tor_assert(private_signing_key); tor_assert(v3_ns->type == NS_TYPE_VOTE || v3_ns->type == NS_TYPE_OPINION); @@ -91,43 +89,20 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, client_versions = v3_ns->client_versions; server_versions = v3_ns->server_versions; - if (client_versions || server_versions) { - size_t v_len = 64; - char *cp; - if (client_versions) - v_len += strlen(client_versions); - if (server_versions) - v_len += strlen(server_versions); - version_lines = tor_malloc(v_len); - cp = version_lines; - if (client_versions) { - r = tor_snprintf(cp, v_len-(cp-version_lines), - "client-versions %s\n", client_versions); - if (r < 0) { - log_err(LD_BUG, "Insufficient memory for client-versions line"); - tor_assert(0); - } - cp += strlen(cp); - } - if (server_versions) { - r = tor_snprintf(cp, v_len-(cp-version_lines), - "server-versions %s\n", server_versions); - if (r < 0) { - log_err(LD_BUG, "Insufficient memory for server-versions line"); - tor_assert(0); - } - } + if (client_versions) { + tor_asprintf(&client_versions_line, "client-versions %s\n", + client_versions); } else { - version_lines = tor_strdup(""); + client_versions_line = tor_strdup(""); + } + if (server_versions) { + tor_asprintf(&server_versions_line, "server-versions %s\n", + server_versions); + } else { + server_versions_line = tor_strdup(""); } - len = 8192; - len += strlen(version_lines); - len += (RS_ENTRY_LEN+MICRODESC_LINE_LEN)*smartlist_len(rl->routers); - len += strlen("\ndirectory-footer\n"); - len += v3_ns->cert->cache_info.signed_descriptor_len; - - status = tor_malloc(len); + chunks = smartlist_new(); { char published[ISO_TIME_LEN+1]; char va[ISO_TIME_LEN+1]; @@ -151,7 +126,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, params = tor_strdup(""); tor_assert(cert); - r = tor_snprintf(status, len, + smartlist_add_asprintf(chunks, "network-status-version 3\n" "vote-status %s\n" "consensus-methods %s\n" @@ -160,7 +135,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, "fresh-until %s\n" "valid-until %s\n" "voting-delay %d %d\n" - "%s" /* versions */ + "%s%s" /* versions */ "known-flags %s\n" "flag-thresholds %s\n" "params %s\n" @@ -170,7 +145,8 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, methods, published, va, fu, vu, v3_ns->vote_seconds, v3_ns->dist_seconds, - version_lines, + client_versions_line, + server_versions_line, flags, flag_thresholds, params, @@ -178,88 +154,63 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, fmt_addr32(addr), voter->dir_port, voter->or_port, voter->contact); - if (r < 0) { - log_err(LD_BUG, "Insufficient memory for network status line"); - tor_assert(0); - } - tor_free(params); tor_free(flags); tor_free(flag_thresholds); tor_free(methods); - outp = status + strlen(status); - endp = status + len; if (!tor_digest_is_zero(voter->legacy_id_digest)) { char fpbuf[HEX_DIGEST_LEN+1]; base16_encode(fpbuf, sizeof(fpbuf), voter->legacy_id_digest, DIGEST_LEN); - r = tor_snprintf(outp, endp-outp, "legacy-dir-key %s\n", fpbuf); - if (r < 0) { - log_err(LD_BUG, "Insufficient memory for legacy-dir-key line"); - tor_assert(0); - } - outp += strlen(outp); + smartlist_add_asprintf(chunks, "legacy-dir-key %s\n", fpbuf); } - tor_assert(outp + cert->cache_info.signed_descriptor_len < endp); - memcpy(outp, cert->cache_info.signed_descriptor_body, - cert->cache_info.signed_descriptor_len); - - outp += cert->cache_info.signed_descriptor_len; + smartlist_add(chunks, tor_strndup(cert->cache_info.signed_descriptor_body, + cert->cache_info.signed_descriptor_len)); } SMARTLIST_FOREACH_BEGIN(v3_ns->routerstatus_list, vote_routerstatus_t *, vrs) { +#define MAX_VOTE_ROUTERSTATUS_LEN 8192 + char rs_buf[MAX_VOTE_ROUTERSTATUS_LEN]; vote_microdesc_hash_t *h; - if (routerstatus_format_entry(outp, endp-outp, &vrs->status, + if (routerstatus_format_entry(rs_buf, sizeof(rs_buf), &vrs->status, vrs->version, NS_V3_VOTE, vrs) < 0) { - log_warn(LD_BUG, "Unable to print router status."); - goto err; + log_warn(LD_BUG, "Unable to print router status; skipping"); + continue; } - outp += strlen(outp); + smartlist_add(chunks, tor_strdup(rs_buf)); for (h = vrs->microdesc; h; h = h->next) { - size_t mlen = strlen(h->microdesc_hash_line); - if (outp+mlen >= endp) { - log_warn(LD_BUG, "Can't fit microdesc line in vote."); - } - memcpy(outp, h->microdesc_hash_line, mlen+1); - outp += strlen(outp); + smartlist_add(chunks, tor_strdup(h->microdesc_hash_line)); } } SMARTLIST_FOREACH_END(vrs); - r = tor_snprintf(outp, endp-outp, "directory-footer\n"); - if (r < 0) { - log_err(LD_BUG, "Insufficient memory for directory-footer line"); - tor_assert(0); - } - outp += strlen(outp); + smartlist_add(chunks, tor_strdup("directory-footer\n")); { char signing_key_fingerprint[FINGERPRINT_LEN+1]; - if (tor_snprintf(outp, endp-outp, "directory-signature ")<0) { - log_warn(LD_BUG, "Unable to start signature line."); - goto err; - } - outp += strlen(outp); - if (crypto_pk_get_fingerprint(private_signing_key, signing_key_fingerprint, 0)<0) { log_warn(LD_BUG, "Unable to get fingerprint for signing key"); goto err; } - if (tor_snprintf(outp, endp-outp, "%s %s\n", fingerprint, - signing_key_fingerprint)<0) { - log_warn(LD_BUG, "Unable to end signature line."); - goto err; - } - outp += strlen(outp); + + smartlist_add_asprintf(chunks, "directory-signature %s %s\n", fingerprint, + signing_key_fingerprint); } + status = smartlist_join_strings(chunks, "", 0, NULL); +#define MAX_VOTE_SIGNATURE_LEN 4096 + status_len = strlen(status) + MAX_VOTE_SIGNATURE_LEN + 1; + status = tor_realloc(status, status_len); + if (router_get_networkstatus_v3_hash(status, digest, DIGEST_SHA1)<0) goto err; note_crypto_pk_op(SIGN_DIR); - if (router_append_dirobj_signature(outp,endp-outp,digest, DIGEST_LEN, + if (router_append_dirobj_signature(status+strlen(status), + status_len, + digest, DIGEST_LEN, private_signing_key)<0) { log_warn(LD_BUG, "Unable to sign networkstatus vote."); goto err; @@ -282,7 +233,12 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, err: tor_free(status); done: - tor_free(version_lines); + tor_free(client_versions_line); + tor_free(server_versions_line); + if (chunks) { + SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp)); + smartlist_free(chunks); + } return status; }

1 0

[tor/master] Fix some wide lines
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit cd1cdae0fac33bca359b34dae4062fe87a351661 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 18 10:30:14 2013 -0400 Fix some wide lines --- src/or/routerparse.c | 2 +- src/test/test.c | 3 ++- src/test/test_dir.c | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 370cf26..0d535a6 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1494,7 +1494,7 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, extrainfo = tor_malloc_zero(sizeof(extrainfo_t)); extrainfo->cache_info.is_extrainfo = 1; if (cache_copy) - extrainfo->cache_info.signed_descriptor_body = tor_memdup_nulterm(s, end-s); + extrainfo->cache_info.signed_descriptor_body = tor_memdup_nulterm(s,end-s); extrainfo->cache_info.signed_descriptor_len = end-s; memcpy(extrainfo->cache_info.signed_descriptor_digest, digest, DIGEST_LEN); diff --git a/src/test/test.c b/src/test/test.c index 42aab4c..c12ba93 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -108,7 +108,8 @@ setup_directory(void) r = mkdir(temp_dir); } #else - tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d_%s", (int) getpid(), rnd32); + tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d_%s", + (int) getpid(), rnd32); r = mkdir(temp_dir, 0700); #endif if (r) { diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 849bb9e..de34b5e 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -611,7 +611,7 @@ test_dir_measured_bw_kb_cache(void) test_assert(dirserv_query_measured_bw_cache_kb(mbwl[0].node_id,NULL, NULL)); test_assert(dirserv_query_measured_bw_cache_kb(mbwl[0].node_id,&bw, NULL)); test_eq(bw, 20); - test_assert(dirserv_query_measured_bw_cache_kb(mbwl[0].node_id,NULL, &as_of)); + test_assert(dirserv_query_measured_bw_cache_kb(mbwl[0].node_id,NULL,&as_of)); test_eq(as_of, MBWC_INIT_TIME); /* Now expire it */ curr += MAX_MEASUREMENT_AGE + 1; @@ -619,7 +619,7 @@ test_dir_measured_bw_kb_cache(void) /* Check that the cache is empty */ test_eq(dirserv_get_measured_bw_cache_size(), 0); /* Check that we can't retrieve it */ - test_assert(!dirserv_query_measured_bw_cache_kb(mbwl[0].node_id, NULL, NULL)); + test_assert(!dirserv_query_measured_bw_cache_kb(mbwl[0].node_id, NULL,NULL)); /* Try caching a few things now */ dirserv_cache_measured_bw(&(mbwl[0]), curr); test_eq(dirserv_get_measured_bw_cache_size(), 1); @@ -2050,7 +2050,7 @@ test_consensus_for_umbw(networkstatus_t *con, time_t now) test_assert(con); test_assert(!con->cert); - /* test_assert(con->consensus_method >= MIN_METHOD_TO_CLIP_UNMEASURED_BW_KB); */ + // test_assert(con->consensus_method >= MIN_METHOD_TO_CLIP_UNMEASURED_BW_KB); test_assert(con->consensus_method >= 16); test_eq(4, smartlist_len(con->routerstatus_list)); /* There should be four listed routers; all voters saw the same in this */ @@ -2176,8 +2176,8 @@ test_dir_clip_unmeasured_bw_kb(void) } /** - * This version of test_dir_clip_unmeasured_bw_kb() uses a non-default choice of - * clip bandwidth. + * This version of test_dir_clip_unmeasured_bw_kb() uses a non-default choice + * of clip bandwidth. */ static void

1 0

[tor/master] Refactor routerstatus_format_entry to avoid character-buffers
by nickm＠torproject.org 19 Apr '13

19 Apr '13

commit 9246a7ca58d14a975b2788772238c5a7799d54b6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 20 00:55:34 2013 -0500 Refactor routerstatus_format_entry to avoid character-buffers --- src/or/dirserv.c | 108 ++++++++++++++++++------------------------------ src/or/dirserv.h | 2 +- src/or/dirvote.c | 21 ++++----- src/or/networkstatus.c | 4 +- 4 files changed, 51 insertions(+), 84 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index badacd6..472827a 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2090,11 +2090,10 @@ version_from_platform(const char *platform) return NULL; } -/** Helper: write the router-status information in rs into buf, - * which has at least buf_len free characters. Do NUL-termination. - * Use the same format as in network-status documents. If version is - * non-NULL, add a "v" line for the platform. Return 0 on success, -1 on - * failure. +/** Helper: write the router-status information in rs into a newly + * allocated character buffer. Use the same format as in network-status + * documents. If version is non-NULL, add a "v" line for the platform. + * Return 0 on success, -1 on failure. * * The format argument has one of the following values: * NS_V2 - Output an entry suitable for a V2 NS opinion document @@ -2105,25 +2104,25 @@ version_from_platform(const char *platform) * it contains additional information for the vote. * NS_CONTROL_PORT - Output a NS document for the control port */ -int -routerstatus_format_entry(char *buf, size_t buf_len, - const routerstatus_t *rs, const char *version, +char * +routerstatus_format_entry(const routerstatus_t *rs, const char *version, routerstatus_format_type_t format, const vote_routerstatus_t *vrs) { - int r; - char *cp; char *summary; + char *result = NULL; char published[ISO_TIME_LEN+1]; char identity64[BASE64_DIGEST_LEN+1]; char digest64[BASE64_DIGEST_LEN+1]; + smartlist_t *chunks = NULL; format_iso_time(published, rs->published_on); digest_to_base64(identity64, rs->identity_digest); digest_to_base64(digest64, rs->descriptor_digest); - r = tor_snprintf(buf, buf_len, + chunks = smartlist_new(); + smartlist_add_asprintf(chunks, "r %s %s %s%s%s %s %d %d\n", rs->nickname, identity64, @@ -2133,11 +2132,6 @@ routerstatus_format_entry(char *buf, size_t buf_len, fmt_addr32(rs->addr), (int)rs->or_port, (int)rs->dir_port); - if (r<0) { - log_warn(LD_BUG, "Not enough space in buffer."); - return -1; - } - cp = buf + strlen(buf); /* TODO: Maybe we want to pass in what we need to build the rest of * this here, instead of in the caller. Then we could use the @@ -2146,25 +2140,18 @@ routerstatus_format_entry(char *buf, size_t buf_len, /* V3 microdesc consensuses don't have "a" lines. */ if (format == NS_V3_CONSENSUS_MICRODESC) - return 0; + goto done; /* Possible "a" line. At most one for now. */ if (!tor_addr_is_null(&rs->ipv6_addr)) { - r = tor_snprintf(cp, buf_len - (cp-buf), - "a %s\n", - fmt_addrport(&rs->ipv6_addr, rs->ipv6_orport)); - if (r<0) { - log_warn(LD_BUG, "Not enough space in buffer."); - return -1; - } - cp += strlen(cp); + smartlist_add_asprintf(chunks, "a %s\n", + fmt_addrport(&rs->ipv6_addr, rs->ipv6_orport)); } if (format == NS_V3_CONSENSUS) - return 0; + goto done; - /* NOTE: Whenever this list expands, be sure to increase MAX_FLAG_LINE_LEN*/ - r = tor_snprintf(cp, buf_len - (cp-buf), + smartlist_add_asprintf(chunks, "s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", /* These must stay in alphabetical order. */ rs->is_authority?" Authority":"", @@ -2180,20 +2167,11 @@ routerstatus_format_entry(char *buf, size_t buf_len, rs->is_unnamed?" Unnamed":"", rs->is_v2_dir?" V2Dir":"", rs->is_valid?" Valid":""); - if (r<0) { - log_warn(LD_BUG, "Not enough space in buffer."); - return -1; - } - cp += strlen(cp); /* length of "opt v \n" */ #define V_LINE_OVERHEAD 7 if (version && strlen(version) < MAX_V_LINE_LEN - V_LINE_OVERHEAD) { - if (tor_snprintf(cp, buf_len - (cp-buf), "v %s\n", version)<0) { - log_warn(LD_BUG, "Unable to print router version."); - return -1; - } - cp += strlen(cp); + smartlist_add_asprintf(chunks, "v %s\n", version); } if (format != NS_V2) { @@ -2213,7 +2191,7 @@ routerstatus_format_entry(char *buf, size_t buf_len, log_warn(LD_BUG, "Cannot get any descriptor for %s " "(wanted descriptor %s).", id, dd); - return -1; + goto err; } /* This assert can fire for the control port, because @@ -2247,39 +2225,32 @@ routerstatus_format_entry(char *buf, size_t buf_len, tor_assert(desc); bw = router_get_advertised_bandwidth_capped(desc) / 1000; } - r = tor_snprintf(cp, buf_len - (cp-buf), - "w Bandwidth=%d\n", bw); + smartlist_add_asprintf(chunks, + "w Bandwidth=%d", bw); - if (r<0) { - log_warn(LD_BUG, "Not enough space in buffer."); - return -1; - } - cp += strlen(cp); if (format == NS_V3_VOTE && vrs && vrs->has_measured_bw) { - *--cp = '\0'; /* Kill "\n" */ - r = tor_snprintf(cp, buf_len - (cp-buf), - " Measured=%d\n", vrs->measured_bw); - if (r<0) { - log_warn(LD_BUG, "Not enough space in buffer for weight line."); - return -1; - } - cp += strlen(cp); + smartlist_add_asprintf(chunks, + " Measured=%d", vrs->measured_bw); } + smartlist_add(chunks, tor_strdup("\n")); if (desc) { summary = policy_summarize(desc->exit_policy, AF_INET); - r = tor_snprintf(cp, buf_len - (cp-buf), "p %s\n", summary); - if (r<0) { - log_warn(LD_BUG, "Not enough space in buffer."); - tor_free(summary); - return -1; - } - cp += strlen(cp); + smartlist_add_asprintf(chunks, "p %s\n", summary); tor_free(summary); } } - return 0; + done: + result = smartlist_join_strings(chunks, "", 0, NULL); + + err: + if (chunks) { + SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp)); + smartlist_free(chunks); + } + + return result; } /** Helper for sorting: compares two routerinfos first by address, and then by @@ -3054,14 +3025,15 @@ generate_v2_networkstatus_opinion(void) if (digestmap_get(omit_as_sybil, ri->cache_info.identity_digest)) clear_status_flags_on_sybil(&rs); - if (routerstatus_format_entry(outp, endp-outp, &rs, version, NS_V2, - NULL)) { - log_warn(LD_BUG, "Unable to print router status."); - tor_free(version); - goto done; + { + char *rsf = routerstatus_format_entry(&rs, version, NS_V2, NULL); + if (rsf) { + memcpy(outp, rsf, strlen(rsf)+1); + outp += strlen(outp); + tor_free(rsf); + } } tor_free(version); - outp += strlen(outp); } } SMARTLIST_FOREACH_END(ri); diff --git a/src/or/dirserv.h b/src/or/dirserv.h index 0caf55f..bdd97d8 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -129,7 +129,7 @@ size_t dirserv_estimate_data_size(smartlist_t *fps, int is_serverdescs, int compressed); size_t dirserv_estimate_microdesc_size(const smartlist_t *fps, int compressed); -int routerstatus_format_entry(char *buf, size_t buf_len, +char *routerstatus_format_entry( const routerstatus_t *rs, const char *platform, routerstatus_format_type_t format, const vote_routerstatus_t *vrs); diff --git a/src/or/dirvote.c b/src/or/dirvote.c index bd4e2f6..a787670 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -171,15 +171,12 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, SMARTLIST_FOREACH_BEGIN(v3_ns->routerstatus_list, vote_routerstatus_t *, vrs) { -#define MAX_VOTE_ROUTERSTATUS_LEN 8192 - char rs_buf[MAX_VOTE_ROUTERSTATUS_LEN]; + char *rsf; vote_microdesc_hash_t *h; - if (routerstatus_format_entry(rs_buf, sizeof(rs_buf), &vrs->status, - vrs->version, NS_V3_VOTE, vrs) < 0) { - log_warn(LD_BUG, "Unable to print router status; skipping"); - continue; - } - smartlist_add(chunks, tor_strdup(rs_buf)); + rsf = routerstatus_format_entry(&vrs->status, + vrs->version, NS_V3_VOTE, vrs); + if (rsf) + smartlist_add(chunks, rsf); for (h = vrs->microdesc; h; h = h->next) { smartlist_add(chunks, tor_strdup(h->microdesc_hash_line)); @@ -1982,12 +1979,12 @@ networkstatus_compute_consensus(smartlist_t *votes, } { - char buf[4096]; + char *buf; /* Okay!! Now we can write the descriptor... */ /* First line goes into "buf". */ - routerstatus_format_entry(buf, sizeof(buf), &rs_out, NULL, - rs_format, NULL); - smartlist_add(chunks, tor_strdup(buf)); + buf = routerstatus_format_entry(&rs_out, NULL, rs_format, NULL); + if (buf) + smartlist_add(chunks, buf); } /* Now an m line, if applicable. */ if (flavor == FLAV_MICRODESC && diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index c63c76f..cde1469 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2127,9 +2127,7 @@ signed_descs_update_status_from_consensus_networkstatus(smartlist_t *descs) char * networkstatus_getinfo_helper_single(const routerstatus_t *rs) { - char buf[RS_ENTRY_LEN+1]; - routerstatus_format_entry(buf, sizeof(buf), rs, NULL, NS_CONTROL_PORT, NULL); - return tor_strdup(buf); + return routerstatus_format_entry(rs, NULL, NS_CONTROL_PORT, NULL); } /** Alloc and return a string describing routerstatuses for the most

1 0