51a52cd487651b4a0b73b3c81136e86fec82ce36..da7fc7d3b9a6656f7a8e202d80b3639c29630242
2017-03-17 CentOS Sources
debrand firefox-52.0-5.el7_3
da7fc7 diff | tree
2017-03-17 CentOS Sources
import firefox-52.0-5.el7_3
464556 diff | tree
1 files added
1 files modified
changed files
SOURCES/mozilla-1348168.patch patch | view | blame | history
SPECS/firefox.spec patch | view | blame | history
SOURCES/mozilla-1348168.patch
....@@ -0,0 +1,88 @@
1
+
2
+# HG changeset patch
3
+# User Ehsan Akhgari <ehsan@mozilla.com>
4
+# Date 1489719163 14400
5
+# Node ID 4af7cd795eeef3bce2dd40d5a6e92d21304eaea1
6
+# Parent dac467924a46c4bbff97c948bf4a7143dada2b19
7
+Bug 1348168 - Disable Mozilla custom ImageBitmap extensions that didn't go through proper API review; r=bzbarsky a=dveditz
8
+
9
+diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
10
+--- a/dom/base/nsGlobalWindow.cpp
11
++++ b/dom/base/nsGlobalWindow.cpp
12
+@@ -14993,16 +14993,20 @@ nsGlobalWindow::CreateImageBitmap(const
13
+
14
+ already_AddRefed<mozilla::dom::Promise>
15
+ nsGlobalWindow::CreateImageBitmap(const ImageBitmapSource& aImage,
16
+ int32_t aOffset, int32_t aLength,
17
+ ImageBitmapFormat aFormat,
18
+ const Sequence<ChannelPixelLayout>& aLayout,
19
+ ErrorResult& aRv)
20
+ {
21
++ if (!ImageBitmap::ExtensionsEnabled(nullptr, nullptr)) {
22
++ aRv.Throw(NS_ERROR_TYPE_ERR);
23
++ return nullptr;
24
++ }
25
+ if (aImage.IsArrayBuffer() || aImage.IsArrayBufferView()) {
26
+ return ImageBitmap::Create(this, aImage, aOffset, aLength, aFormat, aLayout,
27
+ aRv);
28
+ } else {
29
+ aRv.Throw(NS_ERROR_TYPE_ERR);
30
+ return nullptr;
31
+ }
32
+ }
33
+diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp
34
+--- a/dom/workers/WorkerScope.cpp
35
++++ b/dom/workers/WorkerScope.cpp
36
+@@ -471,16 +471,24 @@ WorkerGlobalScope::CreateImageBitmap(con
37
+
38
+ already_AddRefed<mozilla::dom::Promise>
39
+ WorkerGlobalScope::CreateImageBitmap(const ImageBitmapSource& aImage,
40
+ int32_t aOffset, int32_t aLength,
41
+ ImageBitmapFormat aFormat,
42
+ const Sequence<ChannelPixelLayout>& aLayout,
43
+ ErrorResult& aRv)
44
+ {
45
++ JSContext* cx = GetCurrentThreadJSContext();
46
++ MOZ_ASSERT(cx);
47
++
48
++ if (!ImageBitmap::ExtensionsEnabled(cx, nullptr)) {
49
++ aRv.Throw(NS_ERROR_TYPE_ERR);
50
++ return nullptr;
51
++ }
52
++
53
+ if (aImage.IsArrayBuffer() || aImage.IsArrayBufferView()) {
54
+ return ImageBitmap::Create(this, aImage, aOffset, aLength, aFormat, aLayout,
55
+ aRv);
56
+ } else {
57
+ aRv.Throw(NS_ERROR_TYPE_ERR);
58
+ return nullptr;
59
+ }
60
+ }
61
+diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
62
+--- a/modules/libpref/init/all.js
63
++++ b/modules/libpref/init/all.js
64
+@@ -831,22 +831,18 @@ pref("ui.scrollToClick", 0);
65
+ pref("canvas.focusring.enabled", true);
66
+ pref("canvas.customfocusring.enabled", false);
67
+ pref("canvas.hitregions.enabled", false);
68
+ pref("canvas.filters.enabled", true);
69
+ // Add support for canvas path objects
70
+ pref("canvas.path.enabled", true);
71
+ pref("canvas.capturestream.enabled", true);
72
+
73
+-// Disable the ImageBitmap-extensions in the release build.
74
+-#ifdef RELEASE_OR_BETA
75
++// Disable the ImageBitmap-extensions for now.
76
+ pref("canvas.imagebitmap_extensions.enabled", false);
77
+-#else
78
+-pref("canvas.imagebitmap_extensions.enabled", true);
79
+-#endif
80
+
81
+ // We want the ability to forcibly disable platform a11y, because
82
+ // some non-a11y-related components attempt to bring it up. See bug
83
+ // 538530 for details about Windows; we have a pref here that allows it
84
+ // to be disabled for performance and testing resons.
85
+ // See bug 761589 for the crossplatform aspect.
86
+ //
87
+ // This pref is checked only once, and the browser needs a restart to
88
+
SPECS/firefox.spec
....@@ -77,7 +77,7 @@
7777 Summary: Mozilla Firefox Web browser
7878 Name: firefox
7979 Version: 52.0
80
-Release: 4%{?dist}
80
+Release: 5%{?dist}
8181 URL: http://www.mozilla.org/projects/firefox/
8282 License: MPLv1.1 or GPLv2+ or LGPLv2+
8383 Group: Applications/Internet
....@@ -126,6 +126,7 @@
126126 Patch112: mozilla-256180.patch
127127 Patch113: rhbz-1414535.patch
128128 Patch114: rhbz-1423012.patch
129
+Patch115: mozilla-1348168.patch
129130
130131 # Upstream patches
131132 # Skia support for big endian platforms, since patch got review- I think we can delete that:
....@@ -379,6 +380,7 @@
379380 %patch112 -p1 -b .mozbz-256180
380381 %patch113 -p1 -b .rhbz-1414535
381382 %patch114 -p1 -b .rhbz-1423012
383
+%patch115 -p1 -b .mozbz-1348168
382384
383385 # Upstream patches
384386 #%patch201 -p1 -b .mozbz-1005535 see Patch201 comment
....@@ -880,6 +882,9 @@
880882 #---------------------------------------------------------------------
881883
882884 %changelog
885
+* Fri Mar 17 2017 Martin Stransky <stransky@redhat.com> - 52.0-5
886
+- Added fix for mozbz#1348168/CVE-2017-5428
887
+
883888 * Mon Mar 6 2017 Jan Horak <jhorak@redhat.com> - 52.0-4
884889 - Update to 52.0 ESR (b4)
885890