December 2016 - tor-commits - lists.torproject.org

[tor/master] Fix a BUG() warning from next_random_exponential_delay().
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit 0815f96416676ace7cfdb5c29000d8cd6ee3459f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:13:11 2016 -0500 Fix a BUG() warning from next_random_exponential_delay(). Fixes 20875; this code is as suggested by teor on the ticket. Thanks! --- changes/bug20875 | 4 ++++ src/or/directory.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug20875 b/changes/bug20875 new file mode 100644 index 0000000..6bba2cb --- /dev/null +++ b/changes/bug20875 @@ -0,0 +1,4 @@ + o Minor bugfixes (download scheduling) + - Resolve a "bug" warning when considering a download schedule whose + delay had approached INT_MAX. Fixes 20875; bugfix on 0.2.9.5-alpha. + diff --git a/src/or/directory.c b/src/or/directory.c index f4fd521..fce48c6 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3787,10 +3787,12 @@ STATIC int next_random_exponential_delay(int delay, int max_delay) { /* Check preconditions */ + if (BUG(max_delay < 0)) + max_delay = 0; if (BUG(delay > max_delay)) delay = max_delay; - if (BUG(delay == INT_MAX)) - delay -= 1; /* prevent overflow */ + if (delay == INT_MAX) + return INT_MAX; /* prevent overflow */ if (BUG(delay < 0)) delay = 0;

1 0

[tor/release-0.2.9] Increase tolerances in util/monotonic_time tests
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit fce425e3ff0281de29f04ac46d8c395befee607d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:08:54 2016 -0500 Increase tolerances in util/monotonic_time tests This is an attempt to fix #19974. --- changes/19974 | 5 +++++ src/test/test_util.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/19974 b/changes/19974 new file mode 100644 index 0000000..5496143 --- /dev/null +++ b/changes/19974 @@ -0,0 +1,5 @@ + o Minor bugfixes (unit tests): + - Fix tolerances in unit tests for monotonic time comparisons between + nanoseconds and microseconds. Previously, we accepted a 10 us + difference only, which is not realistic on every platform's + clock_gettime(). Fixes bug 19974; bugfix on 0.2.9.1-alpha. diff --git a/src/test/test_util.c b/src/test/test_util.c index 7276c0c..fcda564 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5531,9 +5531,9 @@ test_util_monotonic_time(void *arg) tt_u64_op(msecc1, OP_GE, nsecc1 / 1000000); tt_u64_op(usecc1, OP_GE, nsecc1 / 1000); tt_u64_op(msec1, OP_LE, nsec1 / 1000000 + 1); - tt_u64_op(usec1, OP_LE, nsec1 / 1000 +10); + tt_u64_op(usec1, OP_LE, nsec1 / 1000 + 1000); tt_u64_op(msecc1, OP_LE, nsecc1 / 1000000 + 1); - tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 10); + tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 1000); done: ;

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit b0a842913acfb0de16ccb8ae358b6f6ee19d0898 Merge: 129cee1 fce425e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:09:27 2016 -0500 Merge branch 'maint-0.2.9' changes/19974 | 5 +++++ src/test/test_util.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit 78cb55e42fd5188733f714f8db518ecc02f7f380 Merge: 9b37d54 fce425e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:09:23 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/19974 | 5 +++++ src/test/test_util.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/master] Increase tolerances in util/monotonic_time tests
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit fce425e3ff0281de29f04ac46d8c395befee607d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:08:54 2016 -0500 Increase tolerances in util/monotonic_time tests This is an attempt to fix #19974. --- changes/19974 | 5 +++++ src/test/test_util.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/19974 b/changes/19974 new file mode 100644 index 0000000..5496143 --- /dev/null +++ b/changes/19974 @@ -0,0 +1,5 @@ + o Minor bugfixes (unit tests): + - Fix tolerances in unit tests for monotonic time comparisons between + nanoseconds and microseconds. Previously, we accepted a 10 us + difference only, which is not realistic on every platform's + clock_gettime(). Fixes bug 19974; bugfix on 0.2.9.1-alpha. diff --git a/src/test/test_util.c b/src/test/test_util.c index 7276c0c..fcda564 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5531,9 +5531,9 @@ test_util_monotonic_time(void *arg) tt_u64_op(msecc1, OP_GE, nsecc1 / 1000000); tt_u64_op(usecc1, OP_GE, nsecc1 / 1000); tt_u64_op(msec1, OP_LE, nsec1 / 1000000 + 1); - tt_u64_op(usec1, OP_LE, nsec1 / 1000 +10); + tt_u64_op(usec1, OP_LE, nsec1 / 1000 + 1000); tt_u64_op(msecc1, OP_LE, nsecc1 / 1000000 + 1); - tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 10); + tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 1000); done: ;

1 0

[tor/maint-0.2.9] Increase tolerances in util/monotonic_time tests
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit fce425e3ff0281de29f04ac46d8c395befee607d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:08:54 2016 -0500 Increase tolerances in util/monotonic_time tests This is an attempt to fix #19974. --- changes/19974 | 5 +++++ src/test/test_util.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/19974 b/changes/19974 new file mode 100644 index 0000000..5496143 --- /dev/null +++ b/changes/19974 @@ -0,0 +1,5 @@ + o Minor bugfixes (unit tests): + - Fix tolerances in unit tests for monotonic time comparisons between + nanoseconds and microseconds. Previously, we accepted a 10 us + difference only, which is not realistic on every platform's + clock_gettime(). Fixes bug 19974; bugfix on 0.2.9.1-alpha. diff --git a/src/test/test_util.c b/src/test/test_util.c index 7276c0c..fcda564 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5531,9 +5531,9 @@ test_util_monotonic_time(void *arg) tt_u64_op(msecc1, OP_GE, nsecc1 / 1000000); tt_u64_op(usecc1, OP_GE, nsecc1 / 1000); tt_u64_op(msec1, OP_LE, nsec1 / 1000000 + 1); - tt_u64_op(usec1, OP_LE, nsec1 / 1000 +10); + tt_u64_op(usec1, OP_LE, nsec1 / 1000 + 1000); tt_u64_op(msecc1, OP_LE, nsecc1 / 1000000 + 1); - tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 10); + tt_u64_op(usecc1, OP_LE, nsecc1 / 1000 + 1000); done: ;

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit 129cee1c7511edd82dae77cf2946b147e4eed887 Merge: 41adfd6 d6ca36d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 10:52:28 2016 -0500 Merge branch 'maint-0.2.9' changes/bug20710_025 | 4 ++++ src/common/sandbox.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.9] Fix major errors in freeing getaddrinfo sandbox cache
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit 6a069959c6afac90231def95712b08b887735192 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 1 10:36:02 2016 -0500 Fix major errors in freeing getaddrinfo sandbox cache Patch from cypherpunks. Fixes bug 20710; bugfix on 0.2.5.5-alpha. --- src/common/sandbox.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index e43b64b..1059007 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1486,13 +1486,14 @@ sandbox_add_addrinfo(const char *name) void sandbox_free_getaddrinfo_cache(void) { - cached_getaddrinfo_item_t **next, **item; + cached_getaddrinfo_item_t **next, **item, *this; for (item = HT_START(getaddrinfo_cache, &getaddrinfo_cache); item; item = next) { + this = *item; next = HT_NEXT_RMV(getaddrinfo_cache, &getaddrinfo_cache, item); - cached_getaddrinfo_item_free(*item); + cached_getaddrinfo_item_free(this); } HT_CLEAR(getaddrinfo_cache, &getaddrinfo_cache);

1 0

[tor/master] Merge branch 'bug20710_025' into maint-0.2.9
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit d6ca36defa25e0d77718731924195cc244a18b11 Merge: 30f0516 045a50e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 10:52:12 2016 -0500 Merge branch 'bug20710_025' into maint-0.2.9 changes/bug20710_025 | 4 ++++ src/common/sandbox.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/master] Forgot to add changes file for 20710.
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit 045a50e45a74b9e403a320e4d3590a8eb0793d09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 10:51:39 2016 -0500 Forgot to add changes file for 20710. --- changes/bug20710_025 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug20710_025 b/changes/bug20710_025 new file mode 100644 index 0000000..12bd075 --- /dev/null +++ b/changes/bug20710_025 @@ -0,0 +1,4 @@ + o Minor bugfixes (memory leak, use-after-free, linux seccomp2 sandbox): + - Fix a memory leak and use-after-free error when removing entries + from the sandbox's getaddrinfo() cache. Fixes bug 20710; bugfix on + 0.2.5.5-alpha. Patch from "cypherpunks".

1 0