head	1.2;
access;
symbols;
locks; strict;
comment	@// @;


1.2
date	2020.11.21.09.47.11;	author wiz;	state dead;
branches;
next	1.1;
commitid	6OUgEtmxQsrlNJwC;

1.1
date	2020.11.05.16.35.25;	author nia;	state Exp;
branches;
next	;
commitid	iaBhz3CDVPLezIuC;


desc
@@


1.2
log
@mozjs68: remove

Use mozjs78 instead.

No package in pkgsrc uses this version.
@
text
@$NetBSD: patch-jit_ProcessExecutableMemory.cpp,v 1.1 2020/11/05 16:35:25 nia Exp $

PaX MPROTECT safety for NetBSD.

--- jit/ProcessExecutableMemory.cpp.orig	2020-03-05 20:56:58.000000000 +0000
+++ jit/ProcessExecutableMemory.cpp
@@@@ -343,9 +343,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_PRIVATE | MAP_ANON, -1, 0,
                                    "js-executable-memory");
+#endif
   if (p == MAP_FAILED) {
     return nullptr;
   }
@@@@ -390,8 +397,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;
@


1.1
log
@mozjs68: Make PaX-MPROTECT safe on NetBSD.
@
text
@d1 1
a1 1
$NetBSD$
@