tor-commits June 2011

tor-commits@lists.torproject.org

14 participants
716 discussions

[tor/release-0.2.2] Merge branch 'bug3407' into maint-0.2.2
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 209229f100d20958d0826d4f6773d7f6b3a43ade Merge: 64bfbcb 227896e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 17 14:59:39 2011 -0400 Merge branch 'bug3407' into maint-0.2.2 changes/fix-connection_printf_to_buf | 15 ++++++++ src/or/control.c | 66 +++++++++++---------------------- 2 files changed, 37 insertions(+), 44 deletions(-)

1 0

[tor/release-0.2.2] Check maximum properly in crypto_rand_int()
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 5afab5ca197112b01135980d6cb3694a4519e3cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 1 11:48:39 2011 -0400 Check maximum properly in crypto_rand_int() George Kadianakis notes that if you give crypto_rand_int() a value above INT_MAX, it can return a negative number, which is not what the documentation would imply. The simple solution is to assert that the input is in [1,INT_MAX+1]. If in the future we need a random-value function that can return values up to UINT_MAX, we can add one. Fixes bug 3306; bugfix on 0.2.2pre14. --- changes/bug3306 | 5 +++++ src/common/crypto.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug3306 b/changes/bug3306 new file mode 100644 index 0000000..b1bb103 --- /dev/null +++ b/changes/bug3306 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Make our crypto_rand_int() function check the value of its input + correctly. Previously, it accepted values up to UINT_MAX, but + could return a negative number if given a value above INT_MAX+1. + Found by George Kadianakis. Fixes bug 3306; bugfix on 0.2.2pre14. diff --git a/src/common/crypto.c b/src/common/crypto.c index d8e6619..851f11b 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2145,13 +2145,14 @@ crypto_rand(char *to, size_t n) } /** Return a pseudorandom integer, chosen uniformly from the values - * between 0 and max-1. */ + * between 0 and max-1 inclusive. max must be between 1 and + * INT_MAX+1, inclusive. */ int crypto_rand_int(unsigned int max) { unsigned int val; unsigned int cutoff; - tor_assert(max < UINT_MAX); + tor_assert(max <= ((unsigned int)INT_MAX)+1); tor_assert(max > 0); /* don't div by 0 */ /* We ignore any values that are >= 'cutoff,' to avoid biasing the

1 0

[tor/release-0.2.2] Detect insanely large circuit build state; don't give its length to rand_int
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 42e4e156d95a1c28a666a5346d491c4ed71435dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 1 12:12:01 2011 -0400 Detect insanely large circuit build state; don't give its length to rand_int --- changes/bug3306 | 4 ++++ src/or/circuitbuild.c | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/changes/bug3306 b/changes/bug3306 index b1bb103..f868a24 100644 --- a/changes/bug3306 +++ b/changes/bug3306 @@ -3,3 +3,7 @@ correctly. Previously, it accepted values up to UINT_MAX, but could return a negative number if given a value above INT_MAX+1. Found by George Kadianakis. Fixes bug 3306; bugfix on 0.2.2pre14. + + - Avoid a segfault when reading a malformed circuit build state + with more than INT_MAX entries. Found by wanoskarnet. Bugfix on + 0.2.2.4-alpha. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 3f08448..6d7e711 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -678,7 +678,15 @@ circuit_build_times_shuffle_and_store_array(circuit_build_times_t *cbt, log_notice(LD_CIRC, "The number of circuit times that this Tor version " "uses to calculate build times is less than the number stored " "in your state file. Decreasing the circuit time history from " - "%d to %d.", num_times, CBT_NCIRCUITS_TO_OBSERVE); + "%lu to %d.", (unsigned long)num_times, + CBT_NCIRCUITS_TO_OBSERVE); + } + + if (n > INT_MAX-1) { + log_warn(LD_CIRC, "For some insane reasons, you had %lu circuit build " + "observations in your state file. That's far too many; probably " + "there's a bug here.", (unsigned long)n); + n = INT_MAX-1; } /* This code can only be run on a compact array */

1 0

[tor/release-0.2.2] Merge branch 'bug3306_nm_squashed' into maint-0.2.2
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 9e3fc5f61685f937d76e60c5fa1781b80aa5bf68 Merge: 83e3975 42e4e15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 6 16:18:24 2011 -0400 Merge branch 'bug3306_nm_squashed' into maint-0.2.2 changes/bug3306 | 9 +++++++++ src/common/crypto.c | 5 +++-- src/or/circuitbuild.c | 10 +++++++++- 3 files changed, 21 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.2] remove some dead code, found by coverity
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit db7dd3ee7a07d9bc121d1c8f353e206327bb72c5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 20:02:16 2011 +0200 remove some dead code, found by coverity --- changes/coverity_maint | 3 +++ src/or/rephist.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/coverity_maint b/changes/coverity_maint new file mode 100644 index 0000000..ec25d09 --- /dev/null +++ b/changes/coverity_maint @@ -0,0 +1,3 @@ + o Code simplifications and refactoring: + - Remove some dead code as indicated by coverity. + diff --git a/src/or/rephist.c b/src/or/rephist.c index 6be8484..242fe81 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2401,8 +2401,7 @@ rep_hist_buffer_stats_add_circ(circuit_t *circ, time_t end_of_interval) stat = tor_malloc_zero(sizeof(circ_buffer_stats_t)); stat->processed_cells = orcirc->processed_cells; /* 1000.0 for s -> ms; 2.0 because of app-ward and exit-ward queues */ - stat->mean_num_cells_in_queue = interval_length == 0 ? 0.0 : - (double) orcirc->total_cell_waiting_time / + stat->mean_num_cells_in_queue = (double) orcirc->total_cell_waiting_time / (double) interval_length / 1000.0 / 2.0; stat->mean_time_cells_in_queue = (double) orcirc->total_cell_waiting_time /

1 0

[tor/release-0.2.2] Remove a few dead assignments during router parsing
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit e6fff7235e46b794cd77af516a1ecfab9c87de7f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:16:11 2011 +0200 Remove a few dead assignments during router parsing --- changes/coverity_maint | 1 + src/or/routerparse.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/changes/coverity_maint b/changes/coverity_maint index 1bd1c41..fd8c440 100644 --- a/changes/coverity_maint +++ b/changes/coverity_maint @@ -1,5 +1,6 @@ o Code simplifications and refactoring: - Remove some dead code as indicated by coverity. + - Remove a few dead assignments during router parsing. Found by coverity. o Minor bugfixes: - Add some forgotten return value checks during unit tests. Found by coverity. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index f855f9d..42dbcac 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1544,10 +1544,10 @@ router_parse_entry_from_string(const char *s, const char *end, } } - if ((tok = find_opt_by_keyword(tokens, K_CACHES_EXTRA_INFO))) + if (find_opt_by_keyword(tokens, K_CACHES_EXTRA_INFO)) router->caches_extra_info = 1; - if ((tok = find_opt_by_keyword(tokens, K_ALLOW_SINGLE_HOP_EXITS))) + if (find_opt_by_keyword(tokens, K_ALLOW_SINGLE_HOP_EXITS)) router->allow_single_hop_exits = 1; if ((tok = find_opt_by_keyword(tokens, K_EXTRA_INFO_DIGEST))) { @@ -1560,7 +1560,7 @@ router_parse_entry_from_string(const char *s, const char *end, } } - if ((tok = find_opt_by_keyword(tokens, K_HIDDEN_SERVICE_DIR))) { + if (find_opt_by_keyword(tokens, K_HIDDEN_SERVICE_DIR)) { router->wants_to_be_hs_dir = 1; }

1 0

[tor/release-0.2.2] Comment out some obviously dead code.
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 9e56ac27da80969fadaad7eaf64a8384e68a778e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:23:05 2011 +0200 Comment out some obviously dead code. Coverity warned about it, it's harmless to comment out. --- src/or/circuitlist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 4ad244d..8534c38 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -775,8 +775,8 @@ circuit_get_by_circid_orconn_impl(circid_t circ_id, or_connection_t *conn) return found->circuit; return NULL; - /* The rest of this checks for bugs. Disabled by default. */ + /* We comment it out because coverity complains otherwise. { circuit_t *circ; for (circ=global_circuitlist;circ;circ = circ->next) { @@ -795,7 +795,7 @@ circuit_get_by_circid_orconn_impl(circid_t circ_id, or_connection_t *conn) } } return NULL; - } + } */ } /** Return a circ such that:

1 0

[tor/release-0.2.2] Check some more return values in unit tests
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit ff75e8b02dbf35c2ecc82ffd4d2b2112a144322e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:06:01 2011 +0200 Check some more return values in unit tests --- changes/coverity_maint | 3 +++ src/test/test_addr.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/coverity_maint b/changes/coverity_maint index ec25d09..1bd1c41 100644 --- a/changes/coverity_maint +++ b/changes/coverity_maint @@ -1,3 +1,6 @@ o Code simplifications and refactoring: - Remove some dead code as indicated by coverity. + o Minor bugfixes: + - Add some forgotten return value checks during unit tests. Found + by coverity. diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 6db4ee2..1dab0e0 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -436,13 +436,16 @@ test_addr_ip6_helpers(void) /* test tor_addr_parse_mask_ports */ test_addr_mask_ports_parse("[::f]/17:47-95", AF_INET6, 0, 0, 0, 0x0000000f, 17, 47, 95); + test_streq(p1, "::f"); //test_addr_parse("[::fefe:4.1.1.7/120]:999-1000"); //test_addr_parse_check("::fefe:401:107", 120, 999, 1000); test_addr_mask_ports_parse("[::ffff:4.1.1.7]/120:443", AF_INET6, 0, 0, 0x0000ffff, 0x04010107, 120, 443, 443); + test_streq(p1, "::ffff:4.1.1.7"); test_addr_mask_ports_parse("[abcd:2::44a:0]:2-65000", AF_INET6, 0xabcd0002, 0, 0, 0x044a0000, 128, 2, 65000); + test_streq(p1, "abcd:2::44a:0"); r=tor_addr_parse_mask_ports("[fefef::]/112", &t1, NULL, NULL, NULL); test_assert(r == -1); r=tor_addr_parse_mask_ports("efef::/112", &t1, NULL, NULL, NULL);

1 0

[tor/release-0.2.2] Don't use signed 1-bit bitfields
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit 680646e0de29454f92d57bc3a4895d75c95e158c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:27:32 2011 +0200 Don't use signed 1-bit bitfields This was harmless, we never compared it to anything but itself or 0. But Coverity complained, and it had a point. --- changes/coverity_maint | 1 + src/or/policies.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/changes/coverity_maint b/changes/coverity_maint index fd8c440..6d60355 100644 --- a/changes/coverity_maint +++ b/changes/coverity_maint @@ -4,4 +4,5 @@ o Minor bugfixes: - Add some forgotten return value checks during unit tests. Found by coverity. + - Don't use 1-bit wide signed bit fields. Found by coverity. diff --git a/src/or/policies.c b/src/or/policies.c index e48f420..c870360 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -45,7 +45,7 @@ typedef struct policy_summary_item_t { uint16_t prt_max; /**< Highest port number to accept/reject. */ uint64_t reject_count; /**< Number of IP-Addresses that are rejected to this port range. */ - int accepted:1; /** Has this port already been accepted */ + unsigned int accepted:1; /** Has this port already been accepted */ } policy_summary_item_t; /** Private networks. This list is used in two places, once to expand the

1 0

[tor/release-0.2.2] Fix a rare memleak during stats writing
by arma＠torproject.org 20 Jun '11

20 Jun '11

commit f30327449009a7f00b0f5c2bd09a7eff615df3dd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:35:26 2011 +0200 Fix a rare memleak during stats writing If rep_hist_buffer_stats_write() was called unitinitalized, we'd leak memory. --- changes/coverity_maint | 1 + src/or/rephist.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/coverity_maint b/changes/coverity_maint index 6d60355..e7be90a 100644 --- a/changes/coverity_maint +++ b/changes/coverity_maint @@ -5,4 +5,5 @@ - Add some forgotten return value checks during unit tests. Found by coverity. - Don't use 1-bit wide signed bit fields. Found by coverity. + - Fix a rare memory leak during stats writing. Found by coverity. diff --git a/src/or/rephist.c b/src/or/rephist.c index 242fe81..54593a0 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2451,8 +2451,8 @@ rep_hist_buffer_stats_write(time_t now) int processed_cells[SHARES], circs_in_share[SHARES], number_of_circuits, i; double queued_cells[SHARES], time_in_queue[SHARES]; - smartlist_t *str_build = smartlist_create(); - char *str = NULL, *buf=NULL; + smartlist_t *str_build = NULL; + char *str = NULL, *buf = NULL; circuit_t *circ; if (!start_of_buffer_stats_interval) @@ -2460,6 +2460,8 @@ rep_hist_buffer_stats_write(time_t now) if (start_of_buffer_stats_interval + WRITE_STATS_INTERVAL > now) goto done; /* Not ready to write */ + str_build = smartlist_create(); + /* add current circuits to stats */ for (circ = _circuit_get_global_list(); circ; circ = circ->next) rep_hist_buffer_stats_add_circ(circ, now);

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2011