May 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.3] Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1
by nickm＠torproject.org 10 May '18

10 May '18

commit 2d61a83513d4537735843f50c1766c224dd86183 Merge: ba7043921 6e99286d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 09:22:14 2018 -0400 Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1 changes/bug26069 | 5 +++++ src/or/hs_descriptor.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 10 May '18

10 May '18

commit 1118536142d03ab3e3958788c9bedd354b9fc8fa Merge: f36fea697 b343ba906 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26069 | 5 +++++ src/or/hs_descriptor.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.9] Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9
by nickm＠torproject.org 10 May '18

10 May '18

commit edb6acf9cee42406cfa8380c898b7b664f699b8d Merge: bca8a104b dbdde76f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 09:19:09 2018 -0400 Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9 src/test/test_dir.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)

1 0

[tor/release-0.2.9] Stop logging stack contents when reading a zero-length bandwidth file
by nickm＠torproject.org 10 May '18

10 May '18

commit 867fe40f91b849393b56109586d85e499a53a142 Author: teor <teor2345(a)gmail.com> Date: Wed May 2 22:33:21 2018 +1000 Stop logging stack contents when reading a zero-length bandwidth file When directory authorities read a zero-byte bandwidth file, they log a warning with the contents of an uninitialised buffer. Log a warning about the empty file instead. Fixes bug 26007; bugfix on 0.2.2.1-alpha. --- changes/bug26007 | 5 +++++ src/or/dirserv.c | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/changes/bug26007 b/changes/bug26007 new file mode 100644 index 000000000..efcd15084 --- /dev/null +++ b/changes/bug26007 @@ -0,0 +1,5 @@ + o Major bugfixes (directory authorities, security): + - When directory authorities read a zero-byte bandwidth file, they log + a warning with the contents of an uninitialised buffer. Log a warning + about the empty file instead. + Fixes bug 26007; bugfix on 0.2.2.1-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 41c6bf3dc..94290d5dd 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2750,14 +2750,23 @@ dirserv_read_measured_bandwidths(const char *from_file, time_t file_time, now; int ok; + /* Initialise line, so that we can't possibly run off the end. */ + memset(line, 0, sizeof(line)); + if (fp == NULL) { log_warn(LD_CONFIG, "Can't open bandwidth file at configured location: %s", from_file); return -1; } - if (!fgets(line, sizeof(line), fp) - || !strlen(line) || line[strlen(line)-1] != '\n') { + /* If fgets fails, line is either unmodified, or indeterminate. */ + if (!fgets(line, sizeof(line), fp)) { + log_warn(LD_DIRSERV, "Empty bandwidth file"); + fclose(fp); + return -1; + } + + if (!strlen(line) || line[strlen(line)-1] != '\n') { log_warn(LD_DIRSERV, "Long or truncated time in bandwidth file: %s", escaped(line)); fclose(fp);

1 0

[tor/release-0.2.9] Test read bandwidth measurements with empty file
by nickm＠torproject.org 10 May '18

10 May '18

commit dbdde76f56d0ecb2ef03ac6ec231151016ffbd88 Author: juga0 <juga(a)riseup.net> Date: Tue May 8 16:23:37 2018 +0000 Test read bandwidth measurements with empty file --- src/test/test_dir.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index cdc56acb8..ad5f08643 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1368,6 +1368,25 @@ test_dir_measured_bw_kb(void *arg) return; } +/* Test dirserv_read_measured_bandwidths */ +static void +test_dir_dirserv_read_measured_bandwidths(void *arg) +{ + char *fname=NULL; + (void)arg; + + fname = tor_strdup(get_fname("V3BandwidthsFile")); + /* Test an empty file */ + write_str_to_file(fname, "", 0); + setup_capture_of_logs(LOG_WARN); + tt_int_op(-1, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + expect_log_msg("Empty bandwidth file\n"); + + done: + tor_free(fname); + teardown_capture_of_logs(); +} + #define MBWC_INIT_TIME 1000 /** Do the measured bandwidth cache unit test */ @@ -5458,6 +5477,7 @@ struct testcase_t dir_tests[] = { DIR_LEGACY(versions), DIR_LEGACY(fp_pairs), DIR(split_fps, 0), + DIR_LEGACY(dirserv_read_measured_bandwidths), DIR_LEGACY(measured_bw_kb), DIR_LEGACY(measured_bw_kb_cache), DIR_LEGACY(param_voting),

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 10 May '18

10 May '18

commit a1c06b84b31cbc1c7e0f57928de66d9d1159ce4a Merge: 52bb38868 edb6acf9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 src/test/test_dir.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)

1 0

[tor/release-0.3.1] Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9
by nickm＠torproject.org 10 May '18

10 May '18

commit edb6acf9cee42406cfa8380c898b7b664f699b8d Merge: bca8a104b dbdde76f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 09:19:09 2018 -0400 Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9 src/test/test_dir.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 10 May '18

10 May '18

commit f64fa6b19ec7663f47e600599761fadbde4135e9 Merge: 59812789f 15b8c860d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_dir.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)

1 0

[tor/release-0.3.3] Stop logging stack contents when reading a zero-length bandwidth file
by nickm＠torproject.org 10 May '18

10 May '18

commit 867fe40f91b849393b56109586d85e499a53a142 Author: teor <teor2345(a)gmail.com> Date: Wed May 2 22:33:21 2018 +1000 Stop logging stack contents when reading a zero-length bandwidth file When directory authorities read a zero-byte bandwidth file, they log a warning with the contents of an uninitialised buffer. Log a warning about the empty file instead. Fixes bug 26007; bugfix on 0.2.2.1-alpha. --- changes/bug26007 | 5 +++++ src/or/dirserv.c | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/changes/bug26007 b/changes/bug26007 new file mode 100644 index 000000000..efcd15084 --- /dev/null +++ b/changes/bug26007 @@ -0,0 +1,5 @@ + o Major bugfixes (directory authorities, security): + - When directory authorities read a zero-byte bandwidth file, they log + a warning with the contents of an uninitialised buffer. Log a warning + about the empty file instead. + Fixes bug 26007; bugfix on 0.2.2.1-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 41c6bf3dc..94290d5dd 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2750,14 +2750,23 @@ dirserv_read_measured_bandwidths(const char *from_file, time_t file_time, now; int ok; + /* Initialise line, so that we can't possibly run off the end. */ + memset(line, 0, sizeof(line)); + if (fp == NULL) { log_warn(LD_CONFIG, "Can't open bandwidth file at configured location: %s", from_file); return -1; } - if (!fgets(line, sizeof(line), fp) - || !strlen(line) || line[strlen(line)-1] != '\n') { + /* If fgets fails, line is either unmodified, or indeterminate. */ + if (!fgets(line, sizeof(line), fp)) { + log_warn(LD_DIRSERV, "Empty bandwidth file"); + fclose(fp); + return -1; + } + + if (!strlen(line) || line[strlen(line)-1] != '\n') { log_warn(LD_DIRSERV, "Long or truncated time in bandwidth file: %s", escaped(line)); fclose(fp);

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 10 May '18

10 May '18

commit ba70439210c57b0e0e60b07f116f101725085d85 Merge: aa08c1970 edb6acf9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/test/test_dir.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)

1 0