mozilla-central: changeset 327010:d24db55deb859d9d56c2af110896f3dfccced41e

author	Bob Owen <bobowencode@gmail.com>
	Thu, 22 Dec 2016 11:11:07 +0000 (2016-12-22)
changeset 327010	d24db55deb859d9d56c2af110896f3dfccced41e
parent 327009	c70d06fa53023ae838082b0982fe860882f4bdb8
child 327011	9174d825a6ee546db547c7bfc45a223c858f3532
push id	31116
push user	kwierso@gmail.com
push date	Fri, 23 Dec 2016 02:37:16 +0000 (2016-12-23)
treeherder	mozilla-central@2785aaf276ba [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	aklotz
bugs	1273372
milestone	53.0a1
first release with	nightly linux32 2785aaf276ba / 53.0a1 / 20161223030226 / files nightly linux64 2785aaf276ba / 53.0a1 / 20161223030226 / files nightly mac 2785aaf276ba / 53.0a1 / 20161223030226 / files nightly win32 2785aaf276ba / 53.0a1 / 20161223030226 / files nightly win64 2785aaf276ba / 53.0a1 / 20161223030226 / files
last release without	nightly linux32 f179934df0c1 / 53.0a1 / 20161222030229 / files nightly linux64 f179934df0c1 / 53.0a1 / 20161222030229 / files nightly mac f179934df0c1 / 53.0a1 / 20161222030229 / files nightly win32 f179934df0c1 / 53.0a1 / 20161222030229 / files nightly win64 f179934df0c1 / 53.0a1 / 20161222030229 / files

--- a/security/sandbox/chromium/sandbox/win/src/registry_policy.cc
+++ b/security/sandbox/chromium/sandbox/win/src/registry_policy.cc
@@ -15,17 +15,18 @@
 #include "sandbox/win/src/sandbox_types.h"
 #include "sandbox/win/src/sandbox_utils.h"
 #include "sandbox/win/src/win_utils.h"
 
 namespace {
 
 static const uint32_t kAllowedRegFlags =
     KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY | KEY_READ |
-    GENERIC_READ | GENERIC_EXECUTE | READ_CONTROL;
+    GENERIC_READ | GENERIC_EXECUTE | READ_CONTROL | KEY_WOW64_64KEY |
+    KEY_WOW64_32KEY;
 
 // Opens the key referenced by |obj_attributes| with |access| and
 // checks what permission was given. Remove the WRITE flags and update
 // |access| with the new value.
 NTSTATUS TranslateMaximumAllowed(OBJECT_ATTRIBUTES* obj_attributes,
                                  DWORD* access) {
   NtOpenKeyFunction NtOpenKey = NULL;
   ResolveNTFunctionPtr("NtOpenKey", &NtOpenKey);

--- a/security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
+++ b/security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
@@ -1,8 +1,9 @@
 Please add a link to the bugzilla bug and patch name that should be re-applied.
 Also, please update any existing links to their actual mozilla-central changeset.
 
 https://bugzilla.mozilla.org/show_bug.cgi?id=1287426 bug1287426part4.patch
 https://bugzilla.mozilla.org/show_bug.cgi?id=1287426 bug1287426part5.patch
 https://hg.mozilla.org/mozilla-central/rev/7df8d6639971
 https://bugzilla.mozilla.org/show_bug.cgi?id=1287426 bug1287426part7.patch
 https://bugzilla.mozilla.org/show_bug.cgi?id=1273372 bug1273372part2.patch
+https://bugzilla.mozilla.org/show_bug.cgi?id=1273372 bug1273372part3.patch

security/sandbox/chromium/sandbox/win/src/registry_policy.cc		file \| annotate \| diff \| comparison \| revisions
security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt		file \| annotate \| diff \| comparison \| revisions