September 2014 - tor-commits - lists.torproject.org

[tor/maint-0.2.5] Documenting reject6 and accept6 ExitPolicy entries in manpage.
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit dcb4ee5b83b69234ef8fd0fce8533ab1c4434bd9 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Aug 31 14:09:06 2014 +0300 Documenting reject6 and accept6 ExitPolicy entries in manpage. --- doc/tor.1.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 04d13fb..8d51f6e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1493,6 +1493,11 @@ is non-zero): public (external) IP address. See RFC 1918 and RFC 3330 for more details about internal and reserved IP address space. + + + Tor also allow IPv6 exit policy entries. For instance, "reject6 [FC00::]/7:*" + rejects all destinations that share 7 most significant bit prefix with + address FC00::. Respectively, "accept6 [C000::]/3:*" accepts all destinations + that share 3 most significant bit prefix with address C000::. + + + This directive can be specified multiple times so you don't have to put it all on one line. + +

1 0

[tor/master] Don't delay uploading a new desc if bw estimate was 0
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit 14abf1c3f1534da308eb221fef483a293d449d4f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Aug 30 08:36:20 2014 +0200 Don't delay uploading a new desc if bw estimate was 0 When a tor relay starts up and has no historical information about its bandwidth capability, it uploads a descriptor with a bw estimate of 0. It then starts its bw selftest, but has to wait 20 minutes to upload the next descriptor due to the MAX_BANDWIDTH_CHANGE_FREQ delay. This change should mean that on average, relays start seeing meaningful traffic a little quicker, since they will have a higher chance to appear in the consensus with a nonzero bw. Patch by Roger, changes file and comment by Sebastian. --- changes/bug13000 | 5 +++++ src/or/router.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug13000 b/changes/bug13000 new file mode 100644 index 0000000..e537fb5 --- /dev/null +++ b/changes/bug13000 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - If our previous bandwidth estimate was 0 bytes, allow publishing a + new relay descriptor immediately. Fixes bug 13000; bugfix on + 0.1.1.6-alpha. + diff --git a/src/or/router.c b/src/or/router.c index 87b6705..4d1e74e 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2063,7 +2063,8 @@ mark_my_descriptor_dirty(const char *reason) } /** How frequently will we republish our descriptor because of large (factor - * of 2) shifts in estimated bandwidth? */ + * of 2) shifts in estimated bandwidth? Note: We don't use this constant + * if our previous bandwidth estimate was exactly 0. */ #define MAX_BANDWIDTH_CHANGE_FREQ (20*60) /** Check whether bandwidth has changed a lot since the last time we announced @@ -2081,7 +2082,7 @@ check_descriptor_bandwidth_changed(time_t now) if ((prev != cur && (!prev || !cur)) || cur > prev*2 || cur < prev/2) { - if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now) { + if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now || !prev) { log_info(LD_GENERAL, "Measured bandwidth has changed; rebuilding descriptor."); mark_my_descriptor_dirty("bandwidth has changed");

1 0

[tor/master] Don't list relays w/ bw estimate of 0 in the consensus
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit 962765a35de4a069aba58e9cf6edb726ca22b98e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Aug 30 09:00:40 2014 +0200 Don't list relays w/ bw estimate of 0 in the consensus This implements a feature from bug 13000. Instead of starting a bwauth run with this wrong idea about their bw, relays should do the self-test and then get measured. --- changes/bug13000 | 4 +++- src/or/dirserv.c | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug13000 b/changes/bug13000 index e537fb5..731b4d0 100644 --- a/changes/bug13000 +++ b/changes/bug13000 @@ -2,4 +2,6 @@ - If our previous bandwidth estimate was 0 bytes, allow publishing a new relay descriptor immediately. Fixes bug 13000; bugfix on 0.1.1.6-alpha. - + o Minor features: + - Don't list relays with a bandwidth estimate of 0 in the consensus. + Implements a feature proposed during discussion of bug 13000. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 52258e8..8395c2e 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1051,7 +1051,8 @@ format_versions_list(config_line_t *ln) } /** Return 1 if ri's descriptor is "active" -- running, valid, - * not hibernating, and not too old. Else return 0. + * not hibernating, having observed bw greater 0, and not too old. Else + * return 0. */ static int router_is_active(const routerinfo_t *ri, const node_t *node, time_t now) @@ -1061,6 +1062,8 @@ router_is_active(const routerinfo_t *ri, const node_t *node, time_t now) return 0; if (!node->is_running || !node->is_valid || ri->is_hibernating) return 0; + if (!ri->bandwidthcapacity) + return 0; return 1; }

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 02 Sep '14

02 Sep '14

commit 789055d5ca056b7542d765bde93bdb402f334013 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 2 22:45:50 2014 +0000 Update translations for tails-iuk_completed --- pl.po | 84 ++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/pl.po b/pl.po index 02a74fb..2798288 100644 --- a/pl.po +++ b/pl.po @@ -3,17 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# yodaa <aron.plotnikowski(a)cryptolab.net>, 2014 -# hoek <hoek(a)hoek.pl>, 2014 -# hoek <hoek(a)hoek.pl>, 2014 -# sebx, 2013-2014 +# Aron <aron.plotnikowski(a)cryptolab.net>, 2014 +# Dawid <hoek(a)hoek.pl>, 2014 +# Dawid <hoek(a)hoek.pl>, 2014 +# seb, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-16 11:20+0000\n" -"Last-Translator: yodaa <aron.plotnikowski(a)cryptolab.net>\n" +"POT-Creation-Date: 2014-08-31 15:23+0200\n" +"PO-Revision-Date: 2014-09-02 22:21+0000\n" +"Last-Translator: seb\n" "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,8 +21,8 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 -#: ../lib/Tails/IUK/Frontend.pm:667 +#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:527 +#: ../lib/Tails/IUK/Frontend.pm:671 msgid "For debugging information, see /home/amnesia/.xsession-errors" msgstr "Dla informacji o debugowaniu zobacz /home/amnesia/.xsession-errors" @@ -64,39 +64,43 @@ msgstr "nie ma wystarczającej ilości pamięci na tym systemie" msgid "No explanation available for reason '%{reason}s'." msgstr "Nie ma dostępnego wyjaśnienia dla powodu '%{reason}s'." -#: ../lib/Tails/IUK/Frontend.pm:281 +#: ../lib/Tails/IUK/Frontend.pm:279 +msgid "XXX HEJ XXX" +msgstr "XXX HEJ XXX" + +#: ../lib/Tails/IUK/Frontend.pm:285 msgid "The system is up-to-date" msgstr "System jest aktualny." -#: ../lib/Tails/IUK/Frontend.pm:286 +#: ../lib/Tails/IUK/Frontend.pm:290 msgid "This version of Tails is outdated, and may have security issues." msgstr "Ta wersja Tails jest nieaktualna i może mieć problemy z bezpieczeństwem." -#: ../lib/Tails/IUK/Frontend.pm:318 +#: ../lib/Tails/IUK/Frontend.pm:322 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." msgstr "Następująca przyrostkowa aktualizacja wymaga %{space_needed}s wolnego miejsca na partycji systemu Tails. Obecnie jest tylko %{free_space}s dostępnego miejsca." -#: ../lib/Tails/IUK/Frontend.pm:334 +#: ../lib/Tails/IUK/Frontend.pm:338 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." msgstr "Następująca aktualizacja wymaga %{memory_needed}s wolnej pamięci. Obecnie tylko %{free_memory}s jest dostępnych." -#: ../lib/Tails/IUK/Frontend.pm:356 +#: ../lib/Tails/IUK/Frontend.pm:360 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." msgstr "Przyrostkowa aktualizacja jest dostępna. Pełna aktualizacja nie jest dostępna.\nJeśli uważasz, że to błąd, prosimy o jego zgłoszenie." -#: ../lib/Tails/IUK/Frontend.pm:360 +#: ../lib/Tails/IUK/Frontend.pm:364 msgid "Error while detecting available upgrades" msgstr "Wystąpił błąd podczas wyszukiwania dostępnych aktualizacji" -#: ../lib/Tails/IUK/Frontend.pm:370 +#: ../lib/Tails/IUK/Frontend.pm:374 #, perl-brace-format msgid "" "You should upgrade to %{name}s %{version}s.\n" @@ -112,19 +116,19 @@ msgid "" "Do you want to upgrade now?" msgstr "Powinieneś zaktualizować system do %{name}s %{version}s.\n\nAby uzyskać więcej informacji na temat nowej wersji, idź do %{details_url}s.\n\nZaleca się zamknięcie wszystkich otwartych aplikacji w czasie aktualizacji.\nPobieranie aktualizacji może zająć sporo czasu, od kilku minut do nawet kilku godzin.\nPołączenie sieciowe zostanie wyłączone po pobraniu aktualizacji.\n\nRozmiar pliku do pobrania: %{size}s\n\nCzy chcesz teraz zaktualizować system?" -#: ../lib/Tails/IUK/Frontend.pm:385 +#: ../lib/Tails/IUK/Frontend.pm:389 msgid "Upgrade available" msgstr "Dostępna aktualizacja" -#: ../lib/Tails/IUK/Frontend.pm:386 +#: ../lib/Tails/IUK/Frontend.pm:390 msgid "Upgrade now" msgstr "Aktualizuj teraz" -#: ../lib/Tails/IUK/Frontend.pm:387 +#: ../lib/Tails/IUK/Frontend.pm:391 msgid "Upgrade later" msgstr "Aktualizuj później" -#: ../lib/Tails/IUK/Frontend.pm:395 +#: ../lib/Tails/IUK/Frontend.pm:399 #, perl-brace-format msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" @@ -136,20 +140,20 @@ msgid "" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" msgstr "Powinieneś wykonać ręczną aktualizację do %{name}s %{version}s.\n\nAby uzyskać więcej informacji na temat nowej wersji, przejdź do %{details_url}s.\n\nNie jest możliwe automatyczne uaktualnienie Twojego urządzenia do nowej wersji: %{explanation}s.\n\nAby dowiedzieć się jak ręcznie zaktualizować, przejdź do https://tails.boum.org/doc/first_steps/upgrade/#manual" -#: ../lib/Tails/IUK/Frontend.pm:411 +#: ../lib/Tails/IUK/Frontend.pm:415 msgid "New version available" msgstr "Nowa wersja jest dostępna" -#: ../lib/Tails/IUK/Frontend.pm:468 +#: ../lib/Tails/IUK/Frontend.pm:472 msgid "Downloading upgrade" msgstr "Pobierania aktualizacji" -#: ../lib/Tails/IUK/Frontend.pm:471 +#: ../lib/Tails/IUK/Frontend.pm:475 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." msgstr "Trwa pobieranie aktualizacji do %{name}s %{version}s..." -#: ../lib/Tails/IUK/Frontend.pm:512 +#: ../lib/Tails/IUK/Frontend.pm:516 msgid "" "The upgrade could not be downloaded.\\n\\nCheck your network " "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " @@ -157,26 +161,26 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" msgstr "Aktualizacja nie mogła być pobrana.\\n\\nSprawdź swoje połączenie internetowe i zrestartuj Tails, aby spróbować ponownie. Jeśli problem będzie się powtarzał idź do file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" -#: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 +#: ../lib/Tails/IUK/Frontend.pm:532 ../lib/Tails/IUK/Frontend.pm:551 msgid "Error while downloading the upgrade" msgstr "Wystąpił błąd podczas pobierania aktualizacji" -#: ../lib/Tails/IUK/Frontend.pm:540 +#: ../lib/Tails/IUK/Frontend.pm:544 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." msgstr "Plik wyjściowy '%{output_file}s' nie istnieje, ale tails-iuk-get-target-file nie wykrył tego. Proszę zgłoś błąd." -#: ../lib/Tails/IUK/Frontend.pm:559 +#: ../lib/Tails/IUK/Frontend.pm:563 msgid "Error while creating temporary downloading directory" msgstr "Wystąpił błąd podczas tworzenia tymczasowego folderu pobierania" -#: ../lib/Tails/IUK/Frontend.pm:562 +#: ../lib/Tails/IUK/Frontend.pm:566 msgid "Failed to create temporary download directory" msgstr "Nie udało się utworzyć tymczasowego folderu pobierania" -#: ../lib/Tails/IUK/Frontend.pm:574 +#: ../lib/Tails/IUK/Frontend.pm:578 msgid "" "Your Tails device was successfully upgraded.\n" "\n" @@ -186,46 +190,46 @@ msgid "" "Do you want to restart now?" msgstr "Twój system Tails został pomyślnie zaktualizowany.\n\nNiektóre funkcje bezpieczeństwa zostały tymczasowo wyłączone.\nPowinieneś zrestartować Tails na nowej wersji jak najszybciej.\n\nCzy chcesz teraz zrestartować?" -#: ../lib/Tails/IUK/Frontend.pm:579 +#: ../lib/Tails/IUK/Frontend.pm:583 msgid "Restart Tails" msgstr "Zrestartuj Tails" -#: ../lib/Tails/IUK/Frontend.pm:580 +#: ../lib/Tails/IUK/Frontend.pm:584 msgid "Restart now" msgstr "Zrestartuj teraz" -#: ../lib/Tails/IUK/Frontend.pm:581 +#: ../lib/Tails/IUK/Frontend.pm:585 msgid "Restart later" msgstr "Zrestartuj później" -#: ../lib/Tails/IUK/Frontend.pm:592 +#: ../lib/Tails/IUK/Frontend.pm:596 msgid "Error while restarting the system" msgstr "Wystąpił błąd podczas restartowania systemu" -#: ../lib/Tails/IUK/Frontend.pm:595 +#: ../lib/Tails/IUK/Frontend.pm:599 msgid "Failed to restart the system" msgstr "Nie udało się zrestartować system" -#: ../lib/Tails/IUK/Frontend.pm:610 +#: ../lib/Tails/IUK/Frontend.pm:614 msgid "Error while shutting down the network" msgstr "Wystąpił błąd podczas wyłączania sieci" -#: ../lib/Tails/IUK/Frontend.pm:613 +#: ../lib/Tails/IUK/Frontend.pm:617 msgid "Failed to shutdown network" msgstr "Nie udało się wyłączyć sieci" -#: ../lib/Tails/IUK/Frontend.pm:623 +#: ../lib/Tails/IUK/Frontend.pm:627 msgid "Upgrading the system" msgstr "Trwa aktualizacja systemu" -#: ../lib/Tails/IUK/Frontend.pm:625 +#: ../lib/Tails/IUK/Frontend.pm:629 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." msgstr "Trwa aktualizacja Tails...\n\nZe względów bezpieczeństwa połączenie sieciowe jest teraz wyłączone." -#: ../lib/Tails/IUK/Frontend.pm:662 +#: ../lib/Tails/IUK/Frontend.pm:666 msgid "" "An error occured while installing the upgrade.\\n\\nYour Tails device" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" @@ -233,6 +237,6 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" msgstr "Wystąpił błąd podczas instalacji aktualizacji.\\n\\n\\Twoje urządzenie Tails musi być zreperowane. Być może system Tails nie będzie mógł się w ponownie uruchomić.\\n\\n\\Proszę postępować zgodnie z instrukcjami na file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -#: ../lib/Tails/IUK/Frontend.pm:672 +#: ../lib/Tails/IUK/Frontend.pm:676 msgid "Error while installing the upgrade" msgstr "Wystąpił błąd podczas aktualizacji"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 02 Sep '14

02 Sep '14

commit 776fa1d2d42d852af62c1ae1efeac98bfa8912a3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 2 22:45:46 2014 +0000 Update translations for tails-iuk --- pl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pl.po b/pl.po index 2a2bc94..2798288 100644 --- a/pl.po +++ b/pl.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-08-31 15:23+0200\n" -"PO-Revision-Date: 2014-09-01 09:20+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-09-02 22:21+0000\n" +"Last-Translator: seb\n" "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +66,7 @@ msgstr "Nie ma dostępnego wyjaśnienia dla powodu '%{reason}s'." #: ../lib/Tails/IUK/Frontend.pm:279 msgid "XXX HEJ XXX" -msgstr "" +msgstr "XXX HEJ XXX" #: ../lib/Tails/IUK/Frontend.pm:285 msgid "The system is up-to-date"

1 0

[tor/master] Add more assertions to esc_for_log to please the clangalyzer.
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit 9b850f9200c2d2eac4053cfaa74873bbbe4f0b95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 2 13:29:45 2014 -0400 Add more assertions to esc_for_log to please the clangalyzer. --- src/common/util.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/common/util.c b/src/common/util.c index a7a7fcb..75dd6ed 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1208,9 +1208,14 @@ esc_for_log(const char *s) } } + tor_assert(len <= SSIZE_MAX); + result = outp = tor_malloc(len); *outp++ = '\"'; for (cp = s; *cp; ++cp) { + /* This assertion should always succeed, since we will write at least + * one char here, and two chars for closing quote and nul later */ + tor_assert((outp-result) < (ssize_t)len-2); switch (*cp) { case '\\': case '\"': @@ -1234,6 +1239,7 @@ esc_for_log(const char *s) if (TOR_ISPRINT(*cp) && ((uint8_t)*cp)<127) { *outp++ = *cp; } else { + tor_assert((outp-result) < (ssize_t)len-4); tor_snprintf(outp, 5, "\\%03o", (int)(uint8_t) *cp); outp += 4; } @@ -1241,6 +1247,7 @@ esc_for_log(const char *s) } } + tor_assert((outp-result) <= (ssize_t)len-2); *outp++ = '\"'; *outp++ = 0;

1 0

[tor/master] Add an assertion to read_file_to_str_until_eof
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit 07a16b33724c90c74a96e42f89ccd1ccdcccf2a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 2 13:29:11 2014 -0400 Add an assertion to read_file_to_str_until_eof The clangalyzer doesn't believe our math here. I'm pretty sure our math is right. Also, add some unit tests. --- src/common/util.c | 1 + src/test/test_util.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/src/common/util.c b/src/common/util.c index 3f298cd..a7a7fcb 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2357,6 +2357,7 @@ read_file_to_str_until_eof(int fd, size_t max_bytes_to_read, size_t *sz_out) pos += r; } while (r > 0 && pos < max_bytes_to_read); + tor_assert(pos < string_max); *sz_out = pos; string[pos] = '\0'; return string; diff --git a/src/test/test_util.c b/src/test/test_util.c index c32fadd..1b7c936 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -87,6 +87,20 @@ test_util_read_file_eof_tiny_limit(void *arg) } static void +test_util_read_file_eof_one_loop_a(void *arg) +{ + (void)arg; + test_util_read_until_eof_impl("tor_test_fifo_1ka", 1024, 1023); +} + +static void +test_util_read_file_eof_one_loop_b(void *arg) +{ + (void)arg; + test_util_read_until_eof_impl("tor_test_fifo_1kb", 1024, 1024); +} + +static void test_util_read_file_eof_two_loops(void *arg) { (void)arg; @@ -98,6 +112,14 @@ test_util_read_file_eof_two_loops(void *arg) } static void +test_util_read_file_eof_two_loops_b(void *arg) +{ + (void)arg; + + test_util_read_until_eof_impl("tor_test_fifo_2kb", 2048, 2048); +} + +static void test_util_read_file_eof_zero_bytes(void *arg) { (void)arg; @@ -3870,7 +3892,10 @@ struct testcase_t util_tests[] = { UTIL_TEST(make_environment, 0), UTIL_TEST(set_env_var_in_sl, 0), UTIL_TEST(read_file_eof_tiny_limit, 0), + UTIL_TEST(read_file_eof_one_loop_a, 0), + UTIL_TEST(read_file_eof_one_loop_b, 0), UTIL_TEST(read_file_eof_two_loops, 0), + UTIL_TEST(read_file_eof_two_loops_b, 0), UTIL_TEST(read_file_eof_zero_bytes, 0), UTIL_TEST(write_chunks_to_file, 0), UTIL_TEST(mathlog, 0),

1 0

[tor/master] Explicitly initialize addresses in tor_ersatz_socketpair
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit 1a2f2c163f68f888e45908e6493a273eb48b6236 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 2 12:58:32 2014 -0400 Explicitly initialize addresses in tor_ersatz_socketpair This should stop a false positive from the clangalyzer. --- src/common/compat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/common/compat.c b/src/common/compat.c index 278e5c5..ad627f13 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1435,6 +1435,9 @@ tor_ersatz_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) socklen_t size; int saved_errno = -1; + memset(&connect_addr, 0, sizeof(connect_addr)); + memset(&listen_addr, 0, sizeof(listen_addr)); + if (protocol #ifdef AF_UNIX || family != AF_UNIX

1 0

[tor/master] Apply the MALLOC_ZERO_WORKS fixup to tor_realloc as well.
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit 57c48bf7342d8df9bd3fbd8d52d6bf570b2ecac2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 2 12:53:11 2014 -0400 Apply the MALLOC_ZERO_WORKS fixup to tor_realloc as well. Also, make MALLOC_ZERO_WORKS never get applied when clang analyzer is running. This should make the clangalyzer a little happier. --- src/common/util.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/common/util.c b/src/common/util.c index 16ff8e3..3f298cd 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -96,6 +96,10 @@ #include <sys/wait.h> #endif +#ifdef __clang_analyzer__ +#undef MALLOC_ZERO_WORKS +#endif + /* ===== * Assertion helper. * ===== */ @@ -231,6 +235,13 @@ tor_realloc_(void *ptr, size_t size DMALLOC_PARAMS) tor_assert(size < SIZE_T_CEILING); +#ifndef MALLOC_ZERO_WORKS + /* Some libc mallocs don't work when size==0. Override them. */ + if (size==0) { + size=1; + } +#endif + #ifdef USE_DMALLOC result = dmalloc_realloc(file, line, ptr, size, DMALLOC_FUNC_REALLOC, 0); #else

1 0

[tor/master] Don't include a backtrace test for dereferencing 0 under analyzers
by nickm＠torproject.org 02 Sep '14

02 Sep '14

commit 32b88d2565daa47c087fb5610405fcb57c3ed153 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 2 13:56:31 2014 -0400 Don't include a backtrace test for dereferencing 0 under analyzers They hate this. --- src/test/test_bt_cl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c index 45ae82f..720ccd4 100644 --- a/src/test/test_bt_cl.c +++ b/src/test/test_bt_cl.c @@ -30,7 +30,12 @@ int crash(int x) { if (crashtype == 0) { +#if defined(__clang_analyzer__) || defined(__COVERITY__) + tor_assert(1 == 0); /* Avert your eyes, clangalyzer and coverity! You + * don't need to see us dereference NULL. */ +#else *(volatile int *)0 = 0; +#endif } else if (crashtype == 1) { tor_assert(1 == 0); } else if (crashtype == -1) {

1 0