commit ef93b5b3d6c335d56678f1920f793a8236413928 Author: Mike Perry mikeperry-git@fscked.org Date: Fri Mar 1 16:50:01 2013 -0800

Bug #6386: Potential fix for New Identity Deadlocks+Crashes

Fix was from https://bugzilla.mozilla.org/show_bug.cgi?id=673543. --- ...-nsICacheService.EvictEntries-synchronous.patch | 12 +++++++----- .../firefox/0016-Prevent-WebSocket-DNS-leak.patch | 2 +- ...ize-HTTP-request-order-and-pipeline-depth.patch | 2 +- ...er-event-to-filter-the-Drag-Drop-url-list.patch | 2 +- ...d-mozIThirdPartyUtil.getFirstPartyURI-API.patch | 2 +- .../0020-Add-canvas-image-extraction-prompt.patch | 2 +- ...nt-window-coordinates-for-mouse-event-scr.patch | 2 +- ...se-physical-screen-info.-via-window-and-w.patch | 2 +- ...not-expose-system-colors-to-CSS-or-canvas.patch | 2 +- ...solate-the-Image-Cache-per-url-bar-domain.patch | 2 +- .../0025-nsIHTTPChannel.redirectTo-API.patch | 2 +- ...26-Isolate-DOM-storage-to-first-party-URI.patch | 2 +- ...nk-to-plugin-manager-for-disabled-plugins.patch | 2 +- 13 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch b/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch index b0de192..f16e57b 100644 --- a/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch +++ b/src/current-patches/firefox/0015-Make-nsICacheService.EvictEntries-synchronous.patch @@ -1,4 +1,4 @@ -From fa4ea3d80ec00ec29bdd286c2269b6370c107fce Mon Sep 17 00:00:00 2001 +From 865601ec4faab63762f896c39fac69ee133d8023 Mon Sep 17 00:00:00 2001 From: Mike Perry mikeperry-git@torproject.org Date: Tue, 4 Dec 2012 16:25:52 -0800 Subject: [PATCH 15/27] Make nsICacheService.EvictEntries synchronous @@ -8,14 +8,14 @@ a brief time (on the order of minutes?) after cache clearing/"New Identity".

https://trac.torproject.org/projects/tor/ticket/5715 --- - netwerk/cache/nsCacheService.cpp | 14 +++++++++++++- - 1 files changed, 13 insertions(+), 1 deletions(-) + netwerk/cache/nsCacheService.cpp | 16 +++++++++++++++- + 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/netwerk/cache/nsCacheService.cpp b/netwerk/cache/nsCacheService.cpp -index e88de40..4225742 100644 +index e88de40..5035f68 100644 --- a/netwerk/cache/nsCacheService.cpp +++ b/netwerk/cache/nsCacheService.cpp -@@ -1555,7 +1555,19 @@ NS_IMETHODIMP nsCacheService::VisitEntries(nsICacheVisitor *visitor) +@@ -1555,7 +1555,21 @@ NS_IMETHODIMP nsCacheService::VisitEntries(nsICacheVisitor *visitor)

NS_IMETHODIMP nsCacheService::EvictEntries(nsCacheStoragePolicy storagePolicy) { @@ -28,9 +28,11 @@ index e88de40..4225742 100644 + if (storagePolicy == nsICache::STORE_ANYWHERE && + NS_IsMainThread() && gService && gService->mInitialized) { + nsCacheServiceAutoLock lock(LOCK_TELEM(NSCACHESERVICE_EVICTENTRIESFORCLIENT)); ++ gService->mClearingEntries = true; + gService->DoomActiveEntries(); + gService->ClearDoomList(); + (void) SyncWithCacheIOThread(); ++ gService->mClearingEntries = false; + } + return r; } diff --git a/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch b/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch index 587df41..68cad05 100644 --- a/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch +++ b/src/current-patches/firefox/0016-Prevent-WebSocket-DNS-leak.patch @@ -1,4 +1,4 @@ -From fa93f12f0a727b5ed097b7de2e59d473680f4b8c Mon Sep 17 00:00:00 2001 +From 1c0ac4187521b5ee7f6de1a11df3bbc400fa1b53 Mon Sep 17 00:00:00 2001 From: Mike Perry mikeperry-git@torproject.org Date: Tue, 28 Aug 2012 18:07:37 -0700 Subject: [PATCH 16/27] Prevent WebSocket DNS leak. diff --git a/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch index ecc329b..ddfb184 100644 --- a/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -1,4 +1,4 @@ -From e818ee33a8fd443dda1edbda03b16d49cdb5a47d Mon Sep 17 00:00:00 2001 +From cd87b7f64f035f67ec883c1b1ed4746454892781 Mon Sep 17 00:00:00 2001 From: Mike Perry mikeperry-git@torproject.org Date: Tue, 4 Dec 2012 17:38:51 -0800 Subject: [PATCH 17/27] Randomize HTTP request order and pipeline depth. diff --git a/src/current-patches/firefox/0018-Emit-observer-event-to-filter-the-Drag-Drop-url-list.patch b/src/current-patches/firefox/0018-Emit-observer-event-to-filter-the-Drag-Drop-url-list.patch index 299d9c4..437329b 100644 --- a/src/current-patches/firefox/0018-Emit-observer-event-to-filter-the-Drag-Drop-url-list.patch +++ b/src/current-patches/firefox/0018-Emit-observer-event-to-filter-the-Drag-Drop-url-list.patch @@ -1,4 +1,4 @@ -From c8c34d3df6d8a6cefdc9acee0520a7b0176aef6d Mon Sep 17 00:00:00 2001 +From 5e505dec0ee00899a1fa22e1759e856bb5381468 Mon Sep 17 00:00:00 2001 From: Mike Perry mikeperry-git@torproject.org Date: Thu, 28 Feb 2013 18:10:16 -0800 Subject: [PATCH 18/27] Emit observer event to filter the Drag+Drop url list diff --git a/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch b/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch index bf34575..4baf190 100644 --- a/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch +++ b/src/current-patches/firefox/0019-Add-mozIThirdPartyUtil.getFirstPartyURI-API.patch @@ -1,4 +1,4 @@ -From 5ae9b5b0f8254c9335d770c36e7dad617054ae2e Mon Sep 17 00:00:00 2001 +From f98cbea138095a46570912a2f624b82dff109d55 Mon Sep 17 00:00:00 2001 From: Mike Perry mikeperry-git@torproject.org Date: Wed, 28 Nov 2012 17:08:29 -0500 Subject: [PATCH 19/27] Add mozIThirdPartyUtil.getFirstPartyURI API diff --git a/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch b/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch index 9dae773..b5d2f93 100644 --- a/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch +++ b/src/current-patches/firefox/0020-Add-canvas-image-extraction-prompt.patch @@ -1,4 +1,4 @@ -From e94cff1b650ca95ae937b2eaac0ef6ec95dec6cd Mon Sep 17 00:00:00 2001 +From 43871b07e1ae9a55136f5a4d4454011eae5569f8 Mon Sep 17 00:00:00 2001 From: Kathleen Brade brade@pearlcrescent.com Date: Tue, 27 Nov 2012 13:13:40 -0500 Subject: [PATCH 20/27] Add canvas image extraction prompt. diff --git a/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch b/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch index e978f2e..0cee032 100644 --- a/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch +++ b/src/current-patches/firefox/0021-Return-client-window-coordinates-for-mouse-event-scr.patch @@ -1,4 +1,4 @@ -From a895a19ed20e59425397ec63b5797bb61d038ed1 Mon Sep 17 00:00:00 2001 +From b0696055ca1d34426ae1c8ce2761404d3261525e Mon Sep 17 00:00:00 2001 From: Kathleen Brade brade@pearlcrescent.com Date: Wed, 28 Nov 2012 10:49:09 -0500 Subject: [PATCH 21/27] Return client window coordinates for mouse event diff --git a/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch b/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch index 6330a28..621d2a8 100644 --- a/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch +++ b/src/current-patches/firefox/0022-Do-not-expose-physical-screen-info.-via-window-and-w.patch @@ -1,4 +1,4 @@ -From af28611d01df9d584f69b8ae48fa17a5a9d30ce5 Mon Sep 17 00:00:00 2001 +From 73dd7935b3e9a226e868844bf9a92b257416c5ec Mon Sep 17 00:00:00 2001 From: Kathleen Brade brade@pearlcrescent.com Date: Wed, 28 Nov 2012 11:25:14 -0500 Subject: [PATCH 22/27] Do not expose physical screen info. via window and diff --git a/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch b/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch index fb6bb18..1db7290 100644 --- a/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch +++ b/src/current-patches/firefox/0023-Do-not-expose-system-colors-to-CSS-or-canvas.patch @@ -1,4 +1,4 @@ -From cf6f3b4441ff3ad850a04f461b875c2b99b3ec54 Mon Sep 17 00:00:00 2001 +From 6cf784929d122dd2b83536bdd742e9a718027376 Mon Sep 17 00:00:00 2001 From: Kathleen Brade brade@pearlcrescent.com Date: Wed, 28 Nov 2012 15:08:40 -0500 Subject: [PATCH 23/27] Do not expose system colors to CSS or canvas. diff --git a/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch b/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch index f603315..6689b66 100644 --- a/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch +++ b/src/current-patches/firefox/0024-Isolate-the-Image-Cache-per-url-bar-domain.patch @@ -1,4 +1,4 @@ -From b168d43626d13fe64b33f194778af21114c3549d Mon Sep 17 00:00:00 2001 +From 615c1d7bc870fee55ae37fff0f52b04185c03383 Mon Sep 17 00:00:00 2001 From: Mike Perry mikeperry-git@torproject.org Date: Thu, 6 Dec 2012 14:19:34 -0800 Subject: [PATCH 24/27] Isolate the Image Cache per url bar domain. diff --git a/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch b/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch index f5e42ac..dfcf8ba 100644 --- a/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch +++ b/src/current-patches/firefox/0025-nsIHTTPChannel.redirectTo-API.patch @@ -1,4 +1,4 @@ -From f24d1c4d3b2d434313b0c7a7c6f0f145794a8797 Mon Sep 17 00:00:00 2001 +From 27633d970ddfa360c553aaf3e8697354309f0839 Mon Sep 17 00:00:00 2001 From: Mike Perry mikeperry-git@torproject.org Date: Mon, 14 Jan 2013 19:36:14 -0800 Subject: [PATCH 25/27] nsIHTTPChannel.redirectTo API. diff --git a/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch b/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch index c2edf99..6a08d8b 100644 --- a/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch +++ b/src/current-patches/firefox/0026-Isolate-DOM-storage-to-first-party-URI.patch @@ -1,4 +1,4 @@ -From 1c49a4f4a5312050b03ba8e9d37a073cca049278 Mon Sep 17 00:00:00 2001 +From caf469aa331ab9d92cc83b378cf554f087625dc8 Mon Sep 17 00:00:00 2001 From: Kathleen Brade brade@pearlcrescent.com Date: Thu, 28 Feb 2013 18:02:34 -0800 Subject: [PATCH 26/27] Isolate DOM storage to first party URI diff --git a/src/current-patches/firefox/0027-Remove-link-to-plugin-manager-for-disabled-plugins.patch b/src/current-patches/firefox/0027-Remove-link-to-plugin-manager-for-disabled-plugins.patch index a9f97ea..d023cc9 100644 --- a/src/current-patches/firefox/0027-Remove-link-to-plugin-manager-for-disabled-plugins.patch +++ b/src/current-patches/firefox/0027-Remove-link-to-plugin-manager-for-disabled-plugins.patch @@ -1,4 +1,4 @@ -From 3725f3f825af99091586aba65b3a14a412d460c5 Mon Sep 17 00:00:00 2001 +From 741804b1300397181bc9a9ba03bda2986ae9c726 Mon Sep 17 00:00:00 2001 From: Mike Perry mikeperry-git@torproject.org Date: Thu, 28 Feb 2013 17:41:57 -0800 Subject: [PATCH 27/27] Remove link to plugin manager for disabled plugins.