CVS commit: pkgsrc/www/firefox78

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov 10 02:59:28 UTC 2020

Modified Files:
        pkgsrc/www/firefox78: Makefile distinfo
Added Files:
        pkgsrc/www/firefox78/patches:
            patch-js_src_jit_ProcessExecutableMemory.cpp
            patch-js_src_vm_ArrayBufferObject.cpp

Log Message:
firefox78: Update to 78.4.1. Apply MPROTECT patches from mozjs.

Security Vulnerabilities fixed in Firefox 82.0.3, Firefox ESR 78.4.1, and Thunderbird 78.4.2

#CVE-2020-26950: Write side effects in MCallGetProperty opcode not accounted for


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/firefox78/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/firefox78/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox78/patches/patch-js_src_jit_ProcessExecutableMemory.cpp \
    pkgsrc/www/firefox78/patches/patch-js_src_vm_ArrayBufferObject.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox78/Makefile
diff -u pkgsrc/www/firefox78/Makefile:1.8 pkgsrc/www/firefox78/Makefile:1.9
--- pkgsrc/www/firefox78/Makefile:1.8   Thu Nov  5 09:09:20 2020
+++ pkgsrc/www/firefox78/Makefile       Tue Nov 10 02:59:27 2020
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2020/11/05 09:09:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2020/11/10 02:59:27 nia Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            78.4
-MOZ_BRANCH_MINOR=      .0esr
+MOZ_BRANCH_MINOR=      .1esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox78-/}
-PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz
@@ -37,10 +36,6 @@ LDFLAGS.FreeBSD+=    -lplc4 -lnspr4
 LDFLAGS.Linux+=                -lnspr4
 LDFLAGS.SunOS+=                -lm
 
-NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/${MOZILLA}
-NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/${MOZILLA}-bin
-NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/plugin-container
-
 ALL_ENV+=              MOZ_APP_NAME=${MOZILLA}
 
 # Avoid ld "invalid section index" errors.

Index: pkgsrc/www/firefox78/distinfo
diff -u pkgsrc/www/firefox78/distinfo:1.4 pkgsrc/www/firefox78/distinfo:1.5
--- pkgsrc/www/firefox78/distinfo:1.4   Wed Oct 21 19:23:05 2020
+++ pkgsrc/www/firefox78/distinfo       Tue Nov 10 02:59:27 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2020/10/21 19:23:05 nia Exp $
+$NetBSD: distinfo,v 1.5 2020/11/10 02:59:27 nia Exp $
 
-SHA1 (firefox-78.4.0esr.source.tar.xz) = 4cf96aeedca03d6f84ade360aeb43cae4819342a
-RMD160 (firefox-78.4.0esr.source.tar.xz) = 376ae67b15060906557bb19cd5be385dcf5e6138
-SHA512 (firefox-78.4.0esr.source.tar.xz) = d9de975e9acf7dab6186db877fe2df87a0e9e3c016e884473ecb188025a31032b1fe7f202598285970ed7a48268c7f3e265657708725da4eb7846db85a036246
-Size (firefox-78.4.0esr.source.tar.xz) = 335094656 bytes
+SHA1 (firefox-78.4.1esr.source.tar.xz) = d2a0207af9d0777d26424c60e90fcc93b8b6ad09
+RMD160 (firefox-78.4.1esr.source.tar.xz) = 4cf4a6744019f5afa5b11ac5564ad1188fb30378
+SHA512 (firefox-78.4.1esr.source.tar.xz) = 287096ad67e86b307554475c3b5d1003a325d6d13987bfbec2ec79aa0f8004dce1614ab62585ba5cf153545618906ab640cd4657d5a910085afb3d8ceb46e8de
+Size (firefox-78.4.1esr.source.tar.xz) = 334673424 bytes
 SHA1 (patch-aa) = 11060461fdaca5661e89651b8ded4a59d2abc4d7
 SHA1 (patch-browser_app_profile_firefox.js) = 89cea0a66457c96ad0b94aaa524aa5942ad781d0
 SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8
@@ -20,8 +20,10 @@ SHA1 (patch-gfx_thebes_gfxPlatform.cpp) 
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
+SHA1 (patch-js_src_jit_ProcessExecutableMemory.cpp) = c75e9ea7124c18be1a051106fcc407ddd1e82e46
 SHA1 (patch-js_src_jsfriendapi.h) = 6bbb895b882ee24929f011751c42732215e153a2
 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba
+SHA1 (patch-js_src_vm_ArrayBufferObject.cpp) = ca117633d2aae52d82ec349a0bfb0c03b87898b4
 SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 31536f36cb33f16da309527b50eda9b721608115
 SHA1 (patch-media_libcubeb_src_moz.build) = e4e64a1135cf4157ae5b6f7c1710ebd076953479

Added files:

Index: pkgsrc/www/firefox78/patches/patch-js_src_jit_ProcessExecutableMemory.cpp
diff -u /dev/null pkgsrc/www/firefox78/patches/patch-js_src_jit_ProcessExecutableMemory.cpp:1.1
--- /dev/null   Tue Nov 10 02:59:28 2020
+++ pkgsrc/www/firefox78/patches/patch-js_src_jit_ProcessExecutableMemory.cpp   Tue Nov 10 02:59:27 2020
@@ -0,0 +1,38 @@
+$NetBSD: patch-js_src_jit_ProcessExecutableMemory.cpp,v 1.1 2020/11/10 02:59:27 nia Exp $
+
+PaX MPROTECT safety for NetBSD.
+
+--- js/src/jit/ProcessExecutableMemory.cpp.orig        2020-10-27 23:47:06.000000000 +0000
++++ js/src/jit/ProcessExecutableMemory.cpp
+@@ -362,9 +362,16 @@ static void* ReserveProcessExecutableMem
+   // Note that randomAddr is just a hint: if the address is not available
+   // mmap will pick a different address.
+   void* randomAddr = ComputeRandomAllocationAddress();
++#ifdef PROT_MPROTECT
++  void* p = MozTaggedAnonymousMmap(randomAddr, bytes,
++                                   PROT_MPROTECT(PROT_EXEC | PROT_WRITE | PROT_READ),
++                                   MAP_PRIVATE | MAP_ANON, -1, 0,
++                                   "js-executable-memory");
++#else
+   void* p = MozTaggedAnonymousMmap(randomAddr, bytes, PROT_NONE,
+                                    MAP_NORESERVE | MAP_PRIVATE | MAP_ANON, -1,
+                                    0, "js-executable-memory");
++#endif
+   if (p == MAP_FAILED) {
+     return nullptr;
+   }
+@@ -409,8 +416,12 @@ static unsigned ProtectionSettingToFlags
+ 
+ static MOZ_MUST_USE bool CommitPages(void* addr, size_t bytes,
+                                      ProtectionSetting protection) {
+-  void* p = MozTaggedAnonymousMmap(
+-      addr, bytes, ProtectionSettingToFlags(protection),
++  void* p = MozTaggedAnonymousMmap(addr, bytes,
++#ifdef PROT_MPROTECT
++      ProtectionSettingToFlags(protection) | PROT_MPROTECT(PROT_EXEC | PROT_WRITE | PROT_READ),
++#else
++      ProtectionSettingToFlags(protection),
++#endif
+       MAP_FIXED | MAP_PRIVATE | MAP_ANON, -1, 0, "js-executable-memory");
+   if (p == MAP_FAILED) {
+     return false;
Index: pkgsrc/www/firefox78/patches/patch-js_src_vm_ArrayBufferObject.cpp
diff -u /dev/null pkgsrc/www/firefox78/patches/patch-js_src_vm_ArrayBufferObject.cpp:1.1
--- /dev/null   Tue Nov 10 02:59:28 2020
+++ pkgsrc/www/firefox78/patches/patch-js_src_vm_ArrayBufferObject.cpp  Tue Nov 10 02:59:27 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-js_src_vm_ArrayBufferObject.cpp,v 1.1 2020/11/10 02:59:27 nia Exp $
+
+PaX MPROTECT safety for NetBSD.
+
+--- js/src/vm/ArrayBufferObject.cpp.orig       2020-10-27 23:48:08.000000000 +0000
++++ js/src/vm/ArrayBufferObject.cpp
+@@ -165,9 +165,17 @@ void* js::MapBufferMemory(size_t mappedS
+     return nullptr;
+   }
+ #else   // XP_WIN
++
++#ifdef PROT_MPROTECT
++  void* data =
++      MozTaggedAnonymousMmap(nullptr, mappedSize,
++                             PROT_MPROTECT(PROT_EXEC | PROT_WRITE | PROT_READ),
++                             MAP_PRIVATE | MAP_ANON, -1, 0, "wasm-reserved");
++#else
+   void* data =
+       MozTaggedAnonymousMmap(nullptr, mappedSize, PROT_NONE,
+                              MAP_PRIVATE | MAP_ANON, -1, 0, "wasm-reserved");
++#endif
+   if (data == MAP_FAILED) {
+     return nullptr;
+   }