March 2015 - tor-commits - lists.torproject.org

[tor/release-0.2.6] Fold changes files into changelog for 0.2.6.4-alpha
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit e56263bf20d7011c2f4dfd15e053f22cbd7a5371 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:47:11 2015 -0400 Fold changes files into changelog for 0.2.6.4-alpha --- ChangeLog | 32 ++++++++++++++++++++++++++++++++ changes/15188 | 3 --- changes/bug15033 | 4 ---- changes/bug15037 | 4 ---- changes/bug15064 | 4 ---- changes/bug15083 | 10 ---------- changes/bug15088 | 4 ---- changes/bug15151 | 3 --- changes/feature15006 | 4 ---- changes/ticket14128 | 5 ----- 10 files changed, 32 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec6322e..64e2140 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,34 @@ Changes in version 0.2.6.4-?? - 2015-0?-?? XXXX write a blurb here. + o Major bugfixes (relay, stability, possible security): + - Fix a bug that could lead to a relay crashing with an assertion + failure if a buffer of exactly the wrong layout was passed + to buf_pullup() at exactly the wrong time. Fixes bug 15083; + bugfix on 0.2.0.10-alpha. Patch from 'cypherpunks'. + - Do not assert if the 'data' pointer on a buffer is advanced to the very + end of the buffer; log a BUG message instead. Only assert if it is + past that point. Fixes bug 15083; bugfix on 0.2.0.10-alpha. + o Major bugfixes (Linux seccomp2 sandbox): - Pass IPPROTO_TCP rather than 0 to socket(), so that the Linux seccomp2 sandbox doesn't fail. Fixes bug 14989; bugfix on 0.2.6.3-alpha. - Allow AF_UNIX hidden services to be used with the seccomp2 sandbox. Fixes bug 15003; bugfix on 0.2.6.3-alpha. + - Upon receiving sighup, do not crash during attempts to call + wait4. Fixes bug 15088; bugfix on 0.2.5.1-alpha. Patch from + "sanic". + + o Major bugfixes (FreeBSD IPFW transparent proxy): + - Fix address detection with FreeBSD transparent proxies, + when "TransProxyType ipfw" is in use. + Fixes bug 15064; bugfix on 0.2.5.4-alpha. + + o Minor features (controller): + - Messages about problems in the bootstrap process now include + information about the server we were trying to connect to when we + noticed the problem. Closes ticket 15006. o Minor features (logs): - Quiet some log messages in the heartbeat and at startup. Closes @@ -25,11 +47,21 @@ Changes in version 0.2.6.4-?? - 2015-0?-?? o Minor bugfixes (compilation): - Fix a compilation warning on s390. Fixes bug 14988; bugfix on 0.2.5.2-alpha. + - Fix a compilation warning on FreeBSD. Fixes bug 15151; bugfix on + 0.2.6.2-alpha. o Minor bugfixes (testing): - Fix endianness issues in unit test for resolve_my_address() to have it pass on big endian systems. Fixes bug 14980; bugfix on Tor 0.2.6.3-alpha. + - Avoid a side-effect in a tor_assert() in the unit tests. Fixes bug + 15188; bugfix on 0.1.2.3-alpha. Patch from Tom van der Woerdt. + - When running the new 'make test-stem' target, use the configured + python binary. Fixes bug 15037; bugfix on 0.2.6.3-alpha. Patch + from "cypherpunks". + - When running the zero-length-keys check, do not use the default + torrc file. Fixes bug 15033; bugfix on 0.2.6.3-alpha. Reported + by "reezer". o Directory authority IP change: - The directory authority Faravahar has a new IP address. This diff --git a/changes/15188 b/changes/15188 deleted file mode 100644 index 2065b39..0000000 --- a/changes/15188 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (testing): - - Avoid a side-effect in a tor_assert() in the unit tests. Fixes bug - 15188; bugfix on 0.1.2.3-alpha. Patch from Tom van der Woerdt. diff --git a/changes/bug15033 b/changes/bug15033 deleted file mode 100644 index 953e6c3..0000000 --- a/changes/bug15033 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (tests): - - When running the zero-length-keys check, do not use the default - torrc file. Fixes bug 15033; bugfix on 0.2.6.3-alpha. Reported - by "reezer". diff --git a/changes/bug15037 b/changes/bug15037 deleted file mode 100644 index 587d631..0000000 --- a/changes/bug15037 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (testing): - - When running the new 'make test-stem' target, use the configured - python binary. Fixes bug 15037; bugfix on 0.2.6.3-alpha. Patch - from "cypherpunks". diff --git a/changes/bug15064 b/changes/bug15064 deleted file mode 100644 index e6bd747..0000000 --- a/changes/bug15064 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes (FreeBSD IPFW transparent proxy): - - Fix address detection with FreeBSD transparent proxies, - when "TransProxyType ipfw" is in use. - Fixes bug 15064; bugfix on 0.2.5.4-alpha. diff --git a/changes/bug15083 b/changes/bug15083 deleted file mode 100644 index 5cc79b5..0000000 --- a/changes/bug15083 +++ /dev/null @@ -1,10 +0,0 @@ - o Major bugfixes (relay, stability, possible security): - - Fix a bug that could lead to a relay crashing with an assertion - failure if a buffer of exactly the wrong layout was passed - to buf_pullup() at exactly the wrong time. Fixes bug 15083; - bugfix on 0.2.0.10-alpha. Patch from 'cypherpunks'. - - - Do not assert if the 'data' pointer on a buffer is advanced to the very - end of the buffer; log a BUG message instead. Only assert if it is - past that point. Fixes bug 15083; bugfix on 0.2.0.10-alpha. - diff --git a/changes/bug15088 b/changes/bug15088 deleted file mode 100644 index 95878bd..0000000 --- a/changes/bug15088 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (Linux seccomp2 sandbox): - - Upon receiving sighup, do not crash during attempts to call - wait4. Fixes bug 15088; bugfix on 0.2.5.1-alpha. Patch from - "sanic". diff --git a/changes/bug15151 b/changes/bug15151 deleted file mode 100644 index b9c3061..0000000 --- a/changes/bug15151 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (compilation): - - Fix a compilation warning on FreeBSD. Fixes bug 15151; bugfix on - 0.2.6.2-alpha. diff --git a/changes/feature15006 b/changes/feature15006 deleted file mode 100644 index 168a440..0000000 --- a/changes/feature15006 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (controller): - - Messages about problems in the bootstrap process now include - information about the server we were trying to connect to when we - noticed the problem. Closes ticket 15006. diff --git a/changes/ticket14128 b/changes/ticket14128 deleted file mode 100644 index 38b25fa..0000000 --- a/changes/ticket14128 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (controller): - - New "GETINFO bw-event-cache" to get information about recent bandwidth - events. Closes ticket 14128. Useful for controllers to get recent - bandwidth history after the fix for 13988. -

1 0

[tor/release-0.2.6] Reformat 0.2.6.4-beta changelog
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 101d299f1e99bbbd25cad2bef8c63386a36f8459 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:49:12 2015 -0400 Reformat 0.2.6.4-beta changelog --- ChangeLog | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64e2140..b0570ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,22 @@ -Changes in version 0.2.6.4-?? - 2015-0?-?? - XXXX write a blurb here. +Changes in version 0.2.6.4-beta - 2015-03-?? + Tor 0.2.6.4-alpha fixes a couple of critical issues in the directory + code that an attacker might be able to use in order to crash certain + Tor directories. It also resolves some minor issues left over from, or + introduced in, Tor 0.2.6.3-alpha or earlier. o Major bugfixes (relay, stability, possible security): - Fix a bug that could lead to a relay crashing with an assertion - failure if a buffer of exactly the wrong layout was passed - to buf_pullup() at exactly the wrong time. Fixes bug 15083; - bugfix on 0.2.0.10-alpha. Patch from 'cypherpunks'. - - Do not assert if the 'data' pointer on a buffer is advanced to the very - end of the buffer; log a BUG message instead. Only assert if it is - past that point. Fixes bug 15083; bugfix on 0.2.0.10-alpha. + failure if a buffer of exactly the wrong layout was passed to + buf_pullup() at exactly the wrong time. Fixes bug 15083; bugfix on + 0.2.0.10-alpha. Patch from 'cypherpunks'. + - Do not assert if the 'data' pointer on a buffer is advanced to the + very end of the buffer; log a BUG message instead. Only assert if + it is past that point. Fixes bug 15083; bugfix on 0.2.0.10-alpha. + + o Major bugfixes (FreeBSD IPFW transparent proxy): + - Fix address detection with FreeBSD transparent proxies, when + "TransProxyType ipfw" is in use. Fixes bug 15064; bugfix + on 0.2.5.4-alpha. o Major bugfixes (Linux seccomp2 sandbox): - Pass IPPROTO_TCP rather than 0 to socket(), so that the Linux @@ -16,14 +24,8 @@ Changes in version 0.2.6.4-?? - 2015-0?-?? on 0.2.6.3-alpha. - Allow AF_UNIX hidden services to be used with the seccomp2 sandbox. Fixes bug 15003; bugfix on 0.2.6.3-alpha. - - Upon receiving sighup, do not crash during attempts to call - wait4. Fixes bug 15088; bugfix on 0.2.5.1-alpha. Patch from - "sanic". - - o Major bugfixes (FreeBSD IPFW transparent proxy): - - Fix address detection with FreeBSD transparent proxies, - when "TransProxyType ipfw" is in use. - Fixes bug 15064; bugfix on 0.2.5.4-alpha. + - Upon receiving sighup, do not crash during attempts to call wait4. + Fixes bug 15088; bugfix on 0.2.5.1-alpha. Patch from "sanic". o Minor features (controller): - Messages about problems in the bootstrap process now include @@ -47,8 +49,8 @@ Changes in version 0.2.6.4-?? - 2015-0?-?? o Minor bugfixes (compilation): - Fix a compilation warning on s390. Fixes bug 14988; bugfix on 0.2.5.2-alpha. - - Fix a compilation warning on FreeBSD. Fixes bug 15151; bugfix on - 0.2.6.2-alpha. + - Fix a compilation warning on FreeBSD. Fixes bug 15151; bugfix + on 0.2.6.2-alpha. o Minor bugfixes (testing): - Fix endianness issues in unit test for resolve_my_address() to

1 0

[tor/release-0.2.4] Do not leave empty, invalid chunks in buffers during buf_pullup
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 71ee53fe9bdf3f64eef9b38de55960185e8be1b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 3 22:20:17 2015 +0100 Do not leave empty, invalid chunks in buffers during buf_pullup This fixes an assertion failure bug in 15083; bugfix on 0.2.0.10-alpha. Patch from 'cypherpunks' --- changes/bug15083 | 6 ++++++ src/or/buffers.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug15083 b/changes/bug15083 new file mode 100644 index 0000000..98d1d0e --- /dev/null +++ b/changes/bug15083 @@ -0,0 +1,6 @@ + o Major bugfixes (relay, stability): + - Fix a bug that could lead to a relay crashing with an assertion + failure if a buffer of exactly the wrong layout was passed + to buf_pullup() at exactly the wrong time. Fixes bug 15083; + bugfix on 0.2.0.10-alpha. Patch from 'cypherpunks'. + diff --git a/src/or/buffers.c b/src/or/buffers.c index 9be0476..7976432 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -426,7 +426,7 @@ buf_pullup(buf_t *buf, size_t bytes, int nulterminate) size_t n = bytes - dest->datalen; src = dest->next; tor_assert(src); - if (n > src->datalen) { + if (n >= src->datalen) { memcpy(CHUNK_WRITE_PTR(dest), src->data, src->datalen); dest->datalen += src->datalen; dest->next = src->next;

1 0

[tor/release-0.2.4] Adjust changes header
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit addffcc14ddf40b3cd1bff3fa86a82354e981a03 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 11:07:50 2015 -0400 Adjust changes header --- changes/bug15083 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug15083 b/changes/bug15083 index 2bd0715..5cc79b5 100644 --- a/changes/bug15083 +++ b/changes/bug15083 @@ -1,4 +1,4 @@ - o Major bugfixes (relay, stability): + o Major bugfixes (relay, stability, possible security): - Fix a bug that could lead to a relay crashing with an assertion failure if a buffer of exactly the wrong layout was passed to buf_pullup() at exactly the wrong time. Fixes bug 15083;

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 6704e18dd2e09111eeca0c76fb00a459f9da98ea Merge: 2bcb596 addffcc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 11:08:57 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug15083 | 10 ++++++++++ src/or/buffers.c | 11 +++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.4] Make the assert related to 15083 a tiny bit more tolerant
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 81a994ce77038721df3aa2f77b783db9a52da79e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 3 22:25:26 2015 +0100 Make the assert related to 15083 a tiny bit more tolerant --- changes/bug15083 | 6 +++++- src/or/buffers.c | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/bug15083 b/changes/bug15083 index 98d1d0e..2bd0715 100644 --- a/changes/bug15083 +++ b/changes/bug15083 @@ -3,4 +3,8 @@ failure if a buffer of exactly the wrong layout was passed to buf_pullup() at exactly the wrong time. Fixes bug 15083; bugfix on 0.2.0.10-alpha. Patch from 'cypherpunks'. - + + - Do not assert if the 'data' pointer on a buffer is advanced to the very + end of the buffer; log a BUG message instead. Only assert if it is + past that point. Fixes bug 15083; bugfix on 0.2.0.10-alpha. + diff --git a/src/or/buffers.c b/src/or/buffers.c index 7976432..9dfed00 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -2483,7 +2483,14 @@ assert_buf_ok(buf_t *buf) total += ch->datalen; tor_assert(ch->datalen <= ch->memlen); tor_assert(ch->data >= &ch->mem[0]); - tor_assert(ch->data < &ch->mem[0]+ch->memlen); + tor_assert(ch->data <= &ch->mem[0]+ch->memlen); + if (ch->data == &ch->mem[0]+ch->memlen) { + static int warned = 0; + if (! warned) { + log_warn(LD_BUG, "Invariant violation in buf.c related to #15083"); + warned = 1; + } + } tor_assert(ch->data+ch->datalen <= &ch->mem[0] + ch->memlen); if (!ch->next) tor_assert(ch == buf->tail);

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit b70a0a01ec99064e23ccf56c7ff6d0bec397b2f7 Merge: dc06c07 6704e18 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 9 13:37:22 2015 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug15083 | 10 ++++++++++ src/or/buffers.c | 11 +++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit df4c484021a2c4086084b82f9eade29231c038f9 Merge: dbd5a9a a9ce0cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 23 08:52:35 2015 -0500 Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4 changes/geoip6-january2015 | 2 + src/config/geoip6 | 1263 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 1004 insertions(+), 261 deletions(-)

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit dbd5a9a8f99d92b38f85728edf21b9c6bfe87f38 Merge: 137982f c3f8f5a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 23 08:52:20 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-january2015 | 3 + src/config/geoip |12872 ++++++++++++++++++--------------------------- 2 files changed, 5069 insertions(+), 7806 deletions(-)

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 09 Mar '15

09 Mar '15

commit 7cbdec578b291da11dcd419988ee985b7589ec48 Merge: ba17cdf df4c484 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 23 08:52:55 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/geoip-january2015 | 3 + changes/geoip6-january2015 | 2 + src/config/geoip |12872 +++++++++++++++++--------------------------- src/config/geoip6 | 1263 ++++- 4 files changed, 6073 insertions(+), 8067 deletions(-)

1 0