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

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 21 Dec '17

21 Dec '17

commit 2a7cad957263f5faed3a0b9de8b15d9794a5541c Merge: c2b64ad09 885ba513f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 21 10:20:35 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24665 | 6 ++++++ src/or/scheduler_kist.c | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 21 Dec '17

21 Dec '17

commit 88642bbdc783d8616ba779dbd33378e2c4e09501 Merge: 2a7cad957 c38157be9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 21 10:27:39 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/scheduler_kist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.2] clarify a comment
by nickm＠torproject.org 21 Dec '17

21 Dec '17

commit c38157be9d8fc7de9c6fc0c58e3bc8481a1d48a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 21 10:27:37 2017 -0500 clarify a comment --- src/or/scheduler_kist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index a50be345b..19a8db517 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -286,8 +286,8 @@ update_socket_info_impl, (socket_table_ent_t *ent)) * more in the kernel for now. */ ent->limit = 0; } else { - /* Adding two positive int64_t together will always fit in an uint64_t. - * And we know this will always be positive. */ + /* The positive sum of two int64_t will always fit into an uint64_t. + * And we know this will always be positive, since we checked above. */ ent->limit = (uint64_t)tcp_space + (uint64_t)extra_space; } return;

1 0

[tor/release-0.3.2] sched: Consider extra_space even if negative in KIST
by nickm＠torproject.org 21 Dec '17

21 Dec '17

commit 885ba513ff709eb86a71c7daf7c23aafab4862a8 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Dec 19 16:20:36 2017 -0500 sched: Consider extra_space even if negative in KIST With extra_space negative, it means that the "notsent" queue is quite large so we must consider that value with the current computed tcp_space. If we end up to have negative space, we should not add more data to the kernel since the notsent queue is just too filled up. Fixes #24665 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24665 | 6 ++++++ src/or/scheduler_kist.c | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/changes/bug24665 b/changes/bug24665 new file mode 100644 index 000000000..f950d9dd0 --- /dev/null +++ b/changes/bug24665 @@ -0,0 +1,6 @@ + o Major bugfixes (KIST, scheduler): + - The KIST scheduler did not correctly account for data already enqueued + in each connection's send socket buffer, particularly in cases when the + TCP/IP congestion window was reduced between scheduler calls. This + situation lead to excessive per-connection buffering in the kernel, and + a potential memory DoS. Fixes bug 24665; bugfix on 0.3.2.1-alpha. diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index 9acd89b37..a50be345b 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -266,8 +266,7 @@ update_socket_info_impl, (socket_table_ent_t *ent)) /* These values from the kernel are uint32_t, they will always fit into a * int64_t tcp_space variable but if the congestion window cwnd is smaller - * than the unacked packets, the remaining TCP space is set to 0 so we don't - * write more on this channel. */ + * than the unacked packets, the remaining TCP space is set to 0. */ if (ent->cwnd >= ent->unacked) { tcp_space = (ent->cwnd - ent->unacked) * (int64_t)(ent->mss); } else { @@ -276,20 +275,21 @@ update_socket_info_impl, (socket_table_ent_t *ent)) /* The clamp_double_to_int64 makes sure the first part fits into an int64_t. * In fact, if sock_buf_size_factor is still forced to be >= 0 in config.c, - * then it will be positive for sure. Then we subtract a uint32_t. At worst - * we end up negative, but then we just set extra_space to 0 in the sanity - * check.*/ + * then it will be positive for sure. Then we subtract a uint32_t. Getting a + * negative value is OK, see after how it is being handled. */ extra_space = clamp_double_to_int64( (ent->cwnd * (int64_t)ent->mss) * sock_buf_size_factor) - ent->notsent; - if (extra_space < 0) { - extra_space = 0; + if ((tcp_space + extra_space) < 0) { + /* This means that the "notsent" queue is just too big so we shouldn't put + * more in the kernel for now. */ + ent->limit = 0; + } else { + /* Adding two positive int64_t together will always fit in an uint64_t. + * And we know this will always be positive. */ + ent->limit = (uint64_t)tcp_space + (uint64_t)extra_space; } - - /* Finally we set the limit. Adding two positive int64_t together will always - * fit in an uint64_t. */ - ent->limit = (uint64_t)tcp_space + (uint64_t)extra_space; return; #else /* !(defined(HAVE_KIST_SUPPORT)) */

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 21 Dec '17

21 Dec '17

commit bcc96c77de52ae7a8e73a6b139756e17f25e148d Merge: d0c5fe257 c38157be9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 21 10:27:39 2017 -0500 Merge branch 'maint-0.3.2' src/or/scheduler_kist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[webwml/master] Add redirect for youtube embed
by hiro＠torproject.org 21 Dec '17

21 Dec '17

commit 8bb696171d1e61fe1bc8396315fefa85b6a5051a Author: hiromipaw <hiro(a)torproject.org> Date: Thu Dec 21 13:31:02 2017 +0100 Add redirect for youtube embed --- .htaccess | 2 ++ en/averyonionthankyou.wml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 86a523e0..21386d6f 100644 --- a/.htaccess +++ b/.htaccess @@ -84,6 +84,8 @@ RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302 RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L] RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] +RewriteRule ^averyonionthankyou(.*) /averyonionthankyou.html.en [R=302,L] +RewriteRule ^embed/onionvideo(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=302,L] # The following redirect is necessary because we're using that URL on # some external resources (the donate infrastructure in particular) and diff --git a/en/averyonionthankyou.wml b/en/averyonionthankyou.wml index 777be5e8..62ddb5a3 100644 --- a/en/averyonionthankyou.wml +++ b/en/averyonionthankyou.wml @@ -1,7 +1,7 @@ #include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" DONATION_BANNER="true" <div id="home"> -<iframe width="560" height="315" src="https://www.youtube.com/embed/TXT0F7p7WbM" frameborder="0" gesture="media" allow="encrypted-media" allowfullscreen></iframe> +<iframe width="560" height="315" src="embed/onionvideo" frameborder="0" gesture="media" allow="encrypted-media" allowfullscreen></iframe> </div> #include <foot.wmi> \ No newline at end of file

1 0

[webwml/master] Fix previous redirect
by hiro＠torproject.org 21 Dec '17

21 Dec '17

commit 8ca3afd216ea3a1e9f48c33cd78aeb1577ab6a04 Author: hiromipaw <hiro(a)torproject.org> Date: Thu Dec 21 13:55:35 2017 +0100 Fix previous redirect --- .htaccess | 1 - 1 file changed, 1 deletion(-) diff --git a/.htaccess b/.htaccess index cbc5372b..0c7514f9 100644 --- a/.htaccess +++ b/.htaccess @@ -84,7 +84,6 @@ RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302 RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L] RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] -RewriteRule ^averyonionthankyou(.*) /averyonionthankyou.html.en [R=302,L] RewriteRule ^embed/onionvideo(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=301,L] # The following redirect is necessary because we're using that URL on

1 0

[webwml/master] Fix redirect
by hiro＠torproject.org 21 Dec '17

21 Dec '17

commit 121caf0dede7bb5327af4e3198bc732459c5bd2f Author: hiromipaw <hiro(a)torproject.org> Date: Thu Dec 21 13:44:44 2017 +0100 Fix redirect --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 21386d6f..cbc5372b 100644 --- a/.htaccess +++ b/.htaccess @@ -85,7 +85,7 @@ RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/priva RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] RewriteRule ^averyonionthankyou(.*) /averyonionthankyou.html.en [R=302,L] -RewriteRule ^embed/onionvideo(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=302,L] +RewriteRule ^embed/onionvideo(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=301,L] # The following redirect is necessary because we're using that URL on # some external resources (the donate infrastructure in particular) and

1 0

[webwml/master] Change redirect url
by hiro＠torproject.org 21 Dec '17

21 Dec '17

commit 942706db0e63b714df6c71a8f7dc9f88acc92daf Author: hiromipaw <hiro(a)torproject.org> Date: Thu Dec 21 16:09:28 2017 +0100 Change redirect url --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 0c7514f9..0dca3aa5 100644 --- a/.htaccess +++ b/.htaccess @@ -84,7 +84,7 @@ RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302 RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L] RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] -RewriteRule ^embed/onionvideo(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=301,L] +RewriteRule ^averyonionthankyou(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=301,L] # The following redirect is necessary because we're using that URL on # some external resources (the donate infrastructure in particular) and

1 0

[webwml/staging] Change redirect url
by hiro＠torproject.org 21 Dec '17

21 Dec '17

commit 942706db0e63b714df6c71a8f7dc9f88acc92daf Author: hiromipaw <hiro(a)torproject.org> Date: Thu Dec 21 16:09:28 2017 +0100 Change redirect url --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 0c7514f9..0dca3aa5 100644 --- a/.htaccess +++ b/.htaccess @@ -84,7 +84,7 @@ RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302 RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L] RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L] -RewriteRule ^embed/onionvideo(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=301,L] +RewriteRule ^averyonionthankyou(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=301,L] # The following redirect is necessary because we're using that URL on # some external resources (the donate infrastructure in particular) and

1 0