Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: ensure v8 pointer compression + sandbox is enabled on 64bit nati…
…ve modules (#34851) * fix: ensure v8 pointer compression + sandbox is enabled on 64bit native modules * build: rely on config.gypi to enable pointer compression * Update .patches * Update build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch * chore: update patches Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: Samuel Attard <sam@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
- Loading branch information
1 parent
ce2dcdf
commit c10eece
Showing
3 changed files
with
53 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Samuel Attard <sattard@salesforce.com> | ||
Date: Thu, 7 Jul 2022 14:42:49 -0700 | ||
Subject: build: ensure v8 pointer compression + sandbox is enabled on 64bit | ||
|
||
Aligns common.gypi with the current build flag state of //v8. | ||
|
||
Specifically enables `V8_ENABLE_SANDBOX`, `V8_SANDBOXED_POINTERS`, `V8_COMPRESS_POINTERS` and `V8_COMPRESS_POINTERS_IN_SHARED_CAGE`. | ||
|
||
diff --git a/common.gypi b/common.gypi | ||
index fd4e0b38eb6ecf81b23186ec663499d1e685fdf8..e20092d15d5f71f3e90a2ce655d660a8fa1e1385 100644 | ||
--- a/common.gypi | ||
+++ b/common.gypi | ||
@@ -66,6 +66,8 @@ | ||
'v8_enable_pointer_compression%': 0, | ||
'v8_enable_31bit_smis_on_64bit_arch%': 0, | ||
|
||
+ 'v8_enable_sandbox%': 0, | ||
+ | ||
# Disable V8 untrusted code mitigations. | ||
# See https://github.com/v8/v8/wiki/Untrusted-code-mitigations | ||
'v8_untrusted_code_mitigations': 0, | ||
@@ -135,6 +137,9 @@ | ||
'v8_enable_pointer_compression': 0, | ||
'v8_enable_31bit_smis_on_64bit_arch': 0, | ||
}], | ||
+ ['target_arch in "arm64 x64"', { | ||
+ 'v8_enable_sandbox': 0, | ||
+ }], | ||
['target_arch in "ppc64 s390x"', { | ||
'v8_enable_backtrace': 1, | ||
}], | ||
@@ -394,9 +399,15 @@ | ||
['v8_enable_pointer_compression == 1', { | ||
'defines': [ | ||
'V8_COMPRESS_POINTERS', | ||
- 'V8_COMPRESS_POINTERS_IN_ISOLATE_CAGE', | ||
+ 'V8_COMPRESS_POINTERS_IN_SHARED_CAGE', | ||
], | ||
}], | ||
+ ['v8_enable_sandbox == 1', { | ||
+ 'defines': [ | ||
+ 'V8_ENABLE_SANDBOX', | ||
+ 'V8_SANDBOXED_POINTERS' | ||
+ ] | ||
+ }], | ||
['v8_enable_pointer_compression == 1 or v8_enable_31bit_smis_on_64bit_arch == 1', { | ||
'defines': ['V8_31BIT_SMIS_ON_64BIT_ARCH'], | ||
}], |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters