[tbb-commits] [tor-browser/tor-browser-84.0-10.5-1] Bug 30541: Disable WebGL readPixel() for web content

[sysrqb at torproject.org]

commit 9a180130f182e37e85177e980df0676a45789773
Author: Georg Koppen <gk at torproject.org>
Date:   Wed May 29 12:29:19 2019 +0000

    Bug 30541: Disable WebGL readPixel() for web content
---
 dom/canvas/ClientWebGLContext.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dom/canvas/ClientWebGLContext.cpp b/dom/canvas/ClientWebGLContext.cpp
index 8a5e58e22d7a..8edd94336863 100644
--- a/dom/canvas/ClientWebGLContext.cpp
+++ b/dom/canvas/ClientWebGLContext.cpp
@@ -4615,6 +4615,14 @@ bool ClientWebGLContext::ReadPixels_SharedPrecheck(
     return false;
   }
 
+  // Security check passed, but don't let content readPixel calls through for
+  // now, if Resist Fingerprinting Mode is enabled.
+  if (nsContentUtils::ResistFingerprinting(aCallerType)) {
+    JsWarning("readPixels: Not allowed in Resist Fingerprinting Mode");
+    out_error.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return false;
+  }
+
   return true;
 }