- tor-commits - lists.torproject.org

[torbrowser/maint-2.3] Bug 6370: Enable WebGL (as click-to-play only).
by mikeperry＠torproject.org 31 Jul '12

31 Jul '12

commit 899369e67a447676b0a3923177c2ee46f7720fc3 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jul 31 18:17:05 2012 -0700 Bug 6370: Enable WebGL (as click-to-play only). --- build-scripts/config/prefs.js | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/prefs.js b/build-scripts/config/prefs.js index b6f9a58..52f6956 100644 --- a/build-scripts/config/prefs.js +++ b/build-scripts/config/prefs.js @@ -125,6 +125,8 @@ user_pref("noscript.global", true); user_pref("noscript.gtemp", ""); user_pref("noscript.opacizeObject", 3); user_pref("noscript.forbidWebGL", true); +user_pref("webgl.min_capability_mode", true); +user_pref("webgl.disable-extensions", true); user_pref("noscript.options.tabSelectedIndexes", "5,0,0"); user_pref("noscript.policynames", ""); user_pref("noscript.secureCookies", true); @@ -174,7 +176,6 @@ user_pref("browser.search.order.3", "Google"); user_pref("browser.search.selectedEngine", "Startpage"); // bam user_pref("keyword.URL", "https://startpage.com/do/search?q="); user_pref("dom.indexedDB.enabled", false); -user_pref("webgl.disabled", true); user_pref("security.enable_tls_session_tickets", false); user_pref("network.http.keep-alive.timeout", 20); user_pref("permissions.memory_only", true);

1 0

[torbrowser/maint-2.2] Bug 6370: Enable WebGL (as click-to-play only).
by mikeperry＠torproject.org 31 Jul '12

31 Jul '12

commit 899369e67a447676b0a3923177c2ee46f7720fc3 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jul 31 18:17:05 2012 -0700 Bug 6370: Enable WebGL (as click-to-play only). --- build-scripts/config/prefs.js | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/prefs.js b/build-scripts/config/prefs.js index b6f9a58..52f6956 100644 --- a/build-scripts/config/prefs.js +++ b/build-scripts/config/prefs.js @@ -125,6 +125,8 @@ user_pref("noscript.global", true); user_pref("noscript.gtemp", ""); user_pref("noscript.opacizeObject", 3); user_pref("noscript.forbidWebGL", true); +user_pref("webgl.min_capability_mode", true); +user_pref("webgl.disable-extensions", true); user_pref("noscript.options.tabSelectedIndexes", "5,0,0"); user_pref("noscript.policynames", ""); user_pref("noscript.secureCookies", true); @@ -174,7 +176,6 @@ user_pref("browser.search.order.3", "Google"); user_pref("browser.search.selectedEngine", "Startpage"); // bam user_pref("keyword.URL", "https://startpage.com/do/search?q="); user_pref("dom.indexedDB.enabled", false); -user_pref("webgl.disabled", true); user_pref("security.enable_tls_session_tickets", false); user_pref("network.http.keep-alive.timeout", 20); user_pref("permissions.memory_only", true);

1 0

[torbrowser/master] Bug 5925: Change the urlbar search engine to Startpage
by mikeperry＠torproject.org 31 Jul '12

31 Jul '12

commit fb8c3eaad51acb6b6a82f80815a9fe9e3d5a8935 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jul 31 17:56:27 2012 -0700 Bug 5925: Change the urlbar search engine to Startpage --- build-scripts/config/prefs.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/prefs.js b/build-scripts/config/prefs.js index bdfd7e4..b6f9a58 100644 --- a/build-scripts/config/prefs.js +++ b/build-scripts/config/prefs.js @@ -172,6 +172,7 @@ user_pref("browser.search.order.1", "Startpage"); user_pref("browser.search.order.2", "DuckDuckGo"); user_pref("browser.search.order.3", "Google"); user_pref("browser.search.selectedEngine", "Startpage"); // bam +user_pref("keyword.URL", "https://startpage.com/do/search?q="); user_pref("dom.indexedDB.enabled", false); user_pref("webgl.disabled", true); user_pref("security.enable_tls_session_tickets", false);

1 0

[torbrowser/master] Merge branch 'maint-2.2'
by mikeperry＠torproject.org 31 Jul '12

31 Jul '12

commit 1f4bfd86f6d351be637b5ee0a8aa78bce22e2090 Merge: 0087524 fb8c3ea Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jul 31 18:01:19 2012 -0700 Merge branch 'maint-2.2' build-scripts/config/prefs.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

1 0

[torbrowser/maint-2.3] Bug 5925: Change the urlbar search engine to Startpage
by mikeperry＠torproject.org 31 Jul '12

31 Jul '12

commit fb8c3eaad51acb6b6a82f80815a9fe9e3d5a8935 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jul 31 17:56:27 2012 -0700 Bug 5925: Change the urlbar search engine to Startpage --- build-scripts/config/prefs.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/prefs.js b/build-scripts/config/prefs.js index bdfd7e4..b6f9a58 100644 --- a/build-scripts/config/prefs.js +++ b/build-scripts/config/prefs.js @@ -172,6 +172,7 @@ user_pref("browser.search.order.1", "Startpage"); user_pref("browser.search.order.2", "DuckDuckGo"); user_pref("browser.search.order.3", "Google"); user_pref("browser.search.selectedEngine", "Startpage"); // bam +user_pref("keyword.URL", "https://startpage.com/do/search?q="); user_pref("dom.indexedDB.enabled", false); user_pref("webgl.disabled", true); user_pref("security.enable_tls_session_tickets", false);

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by mikeperry＠torproject.org 31 Jul '12

31 Jul '12

commit 266dd0d28bbfe6ddc1281f031132825583638168 Merge: 0087524 fb8c3ea Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jul 31 18:01:09 2012 -0700 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/prefs.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

1 0

[torbrowser/maint-2.2] Bug 5925: Change the urlbar search engine to Startpage
by mikeperry＠torproject.org 31 Jul '12

31 Jul '12

commit fb8c3eaad51acb6b6a82f80815a9fe9e3d5a8935 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jul 31 17:56:27 2012 -0700 Bug 5925: Change the urlbar search engine to Startpage --- build-scripts/config/prefs.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/config/prefs.js b/build-scripts/config/prefs.js index bdfd7e4..b6f9a58 100644 --- a/build-scripts/config/prefs.js +++ b/build-scripts/config/prefs.js @@ -172,6 +172,7 @@ user_pref("browser.search.order.1", "Startpage"); user_pref("browser.search.order.2", "DuckDuckGo"); user_pref("browser.search.order.3", "Google"); user_pref("browser.search.selectedEngine", "Startpage"); // bam +user_pref("keyword.URL", "https://startpage.com/do/search?q="); user_pref("dom.indexedDB.enabled", false); user_pref("webgl.disabled", true); user_pref("security.enable_tls_session_tickets", false);

1 0

[tor/master] Merge branch 'bug6480_squashed' into maint-0.2.3
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit 122c8efb09643a65cbec6c991f3433774a4524ae Merge: ae75fb1 62637fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 17:19:47 2012 -0400 Merge branch 'bug6480_squashed' into maint-0.2.3 changes/bug6480 | 5 +++++ src/or/dns.c | 30 ++++++++++++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-)

1 0

[tor/master] Avoid hard (impossible?)-to-trigger double-free in dns_resolve()
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit 62637fa22405278758febb1743da9af562524d4c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 12:58:19 2012 -0400 Avoid hard (impossible?)-to-trigger double-free in dns_resolve() Fixes 6480; fix on 0.2.0.1-alpha; based on pseudonymous patch. --- changes/bug6480 | 5 +++++ src/or/dns.c | 30 ++++++++++++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/changes/bug6480 b/changes/bug6480 new file mode 100644 index 0000000..83ae00b --- /dev/null +++ b/changes/bug6480 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Avoid read-from-freed-RAM bug and related double-free bug that + could occur when a DNS request fails while launching it. Fixes + bug 6480; bugfix on 0.2.0.1-alpha. + diff --git a/src/or/dns.c b/src/or/dns.c index da11668..3e88fad 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -168,7 +168,8 @@ static void add_wildcarded_test_address(const char *address); static int configure_nameservers(int force); static int answer_is_wildcarded(const char *ip); static int dns_resolve_impl(edge_connection_t *exitconn, int is_resolve, - or_circuit_t *oncirc, char **resolved_to_hostname); + or_circuit_t *oncirc, char **resolved_to_hostname, + int *made_connection_pending_out); #ifdef DEBUG_DNS_CACHE static void _assert_cache_ok(void); #define assert_cache_ok() _assert_cache_ok() @@ -596,10 +597,12 @@ dns_resolve(edge_connection_t *exitconn) { or_circuit_t *oncirc = TO_OR_CIRCUIT(exitconn->on_circuit); int is_resolve, r; + int made_connection_pending = 0; char *hostname = NULL; is_resolve = exitconn->_base.purpose == EXIT_PURPOSE_RESOLVE; - r = dns_resolve_impl(exitconn, is_resolve, oncirc, &hostname); + r = dns_resolve_impl(exitconn, is_resolve, oncirc, &hostname, + &made_connection_pending); switch (r) { case 1: @@ -639,16 +642,11 @@ dns_resolve(edge_connection_t *exitconn) dns_cancel_pending_resolve(exitconn->_base.address); - if (!exitconn->_base.marked_for_close) { + if (!made_connection_pending && !exitconn->_base.marked_for_close) { + /* If we made the connection pending, then we freed it already in + * dns_cancel_pending_resolve(). If we marked it for close, it'll + * get freed from the main loop. Otherwise, can free it now. */ connection_free(TO_CONN(exitconn)); - // XXX ... and we just leak exitconn otherwise? -RD - // If it's marked for close, it's on closeable_connection_lst in - // main.c. If it's on the closeable list, it will get freed from - // main.c. -NM - // "<armadev> If that's true, there are other bugs around, where we - // don't check if it's marked, and will end up double-freeing." - // On the other hand, I don't know of any actual bugs here, so this - // shouldn't be holding up the rc. -RD } break; default: @@ -667,10 +665,15 @@ dns_resolve(edge_connection_t *exitconn) * Return -2 on a transient error. If it's a reverse resolve and it's * successful, sets *hostname_out to a newly allocated string * holding the cached reverse DNS value. + * + * Set *made_connection_pending_out to true if we have placed + * exitconn on the list of pending connections for some resolve; set it + * to false otherwise. */ static int dns_resolve_impl(edge_connection_t *exitconn, int is_resolve, - or_circuit_t *oncirc, char **hostname_out) + or_circuit_t *oncirc, char **hostname_out, + int *made_connection_pending_out) { cached_resolve_t *resolve; cached_resolve_t search; @@ -684,6 +687,7 @@ dns_resolve_impl(edge_connection_t *exitconn, int is_resolve, tor_assert(!SOCKET_OK(exitconn->_base.s)); assert_cache_ok(); tor_assert(oncirc); + *made_connection_pending_out = 0; /* first check if exitconn->_base.address is an IP. If so, we already * know the answer. */ @@ -757,6 +761,7 @@ dns_resolve_impl(edge_connection_t *exitconn, int is_resolve, pending_connection->conn = exitconn; pending_connection->next = resolve->pending_connections; resolve->pending_connections = pending_connection; + *made_connection_pending_out = 1; log_debug(LD_EXIT,"Connection (fd %d) waiting for pending DNS " "resolve of %s", exitconn->_base.s, escaped_safe_str(exitconn->_base.address)); @@ -797,6 +802,7 @@ dns_resolve_impl(edge_connection_t *exitconn, int is_resolve, pending_connection = tor_malloc_zero(sizeof(pending_connection_t)); pending_connection->conn = exitconn; resolve->pending_connections = pending_connection; + *made_connection_pending_out = 1; /* Add this resolve to the cache and priority queue. */ HT_INSERT(cache_map, &cache_root, resolve);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 31 Jul '12

31 Jul '12

commit c49975a2b895b9742caba29e7cbd4067252c36c0 Merge: d4e2ccc 122c8ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 17:20:36 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6480 | 5 +++++ src/or/dns.c | 30 ++++++++++++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-)

1 0