Commit 9b1cb9d
build: enable v8's siphash for hash seed creation
Triggers the V8_USE_SIPHASH to switch from the internal custom V8
hash seed generation function to an implementation of SipHash. Final
step needed to clear up HashWick.
PR-URL: #26367
Refs: #23259
Refs: https://darksi.de/12.hashwick-v8-vulnerability/
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yang Guo <yangguo@chromium.org>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>1 parent 2c55282 commit 9b1cb9d
5 files changed
Lines changed: 16 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -32,6 +32,9 @@ | |||
| 32 | 32 | # Increment by one for each non-official patch applied to deps/v8. | |
| 33 | 33 | 'v8_embedder_string': '-node.18', | |
| 34 | 34 | ||
| 35 | + # Turn on SipHash for hash seed generation, addresses HashWick | ||
| 36 | + 'v8_use_siphash': 'true', | ||
| 37 | + | ||
| 35 | 38 | # Enable disassembler for `--print-code` v8 options | |
| 36 | 39 | 'v8_enable_disassembler': 1, | |
| 37 | 40 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -509,6 +509,11 @@ | |||
| 509 | 509 | dest='without_snapshot', | |
| 510 | 510 | help=optparse.SUPPRESS_HELP) | |
| 511 | 511 | ||
| 512 | + parser.add_option('--without-siphash', | ||
| 513 | + action='store_true', | ||
| 514 | + dest='without_siphash', | ||
| 515 | + help=optparse.SUPPRESS_HELP) | ||
| 516 | + | ||
| 512 | 517 | parser.add_option('--code-cache-path', | |
| 513 | 518 | action='store', | |
| 514 | 519 | dest='code_cache_path', | |
@@ -1178,6 +1183,7 @@ def configure_v8(o): | |||
| 1178 | 1183 | o['variables']['v8_random_seed'] = 0 # Use a random seed for hash tables. | |
| 1179 | 1184 | o['variables']['v8_promise_internal_field_count'] = 1 # Add internal field to promises for async hooks. | |
| 1180 | 1185 | o['variables']['v8_use_snapshot'] = 'false' if options.without_snapshot else 'true' | |
| 1186 | + o['variables']['v8_use_siphash'] = 'false' if options.without_siphash else 'true' | ||
| 1181 | 1187 | o['variables']['v8_trace_maps'] = 1 if options.trace_maps else 0 | |
| 1182 | 1188 | o['variables']['node_use_v8_platform'] = b(not options.without_v8_platform) | |
| 1183 | 1189 | o['variables']['node_use_bundled_v8'] = b(not options.without_bundled_v8) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -154,6 +154,9 @@ | |||
| 154 | 154 | ['v8_use_snapshot=="true" and v8_use_external_startup_data==1', { | |
| 155 | 155 | 'defines': ['V8_USE_EXTERNAL_STARTUP_DATA',], | |
| 156 | 156 | }], | |
| 157 | + ['v8_use_siphash=="true"', { | ||
| 158 | + 'defines': ['V8_USE_SIPHASH',], | ||
| 159 | + }], | ||
| 157 | 160 | ['dcheck_always_on!=0', { | |
| 158 | 161 | 'defines': ['DEBUG',], | |
| 159 | 162 | }], | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -92,6 +92,7 @@ | |||
| 92 | 92 | 'v8_enable_verify_predictable=<(v8_enable_verify_predictable)', | |
| 93 | 93 | 'v8_target_cpu=<(v8_target_arch)', | |
| 94 | 94 | 'v8_use_snapshot=<(v8_use_snapshot)', | |
| 95 | + 'v8_use_siphash=<(v8_use_siphash)', | ||
| 95 | 96 | ] | |
| 96 | 97 | }, | |
| 97 | 98 | 'conditions': [ | |
@@ -1432,6 +1433,8 @@ | |||
| 1432 | 1433 | '../src/string-stream.h', | |
| 1433 | 1434 | '../src/strtod.cc', | |
| 1434 | 1435 | '../src/strtod.h', | |
| 1436 | + '../src/third_party/siphash/halfsiphash.cc', | ||
| 1437 | + '../src/third_party/siphash/halfsiphash.h', | ||
| 1435 | 1438 | '../src/third_party/utf8-decoder/utf8-decoder.h', | |
| 1436 | 1439 | '../src/tracing/trace-event.cc', | |
| 1437 | 1440 | '../src/tracing/trace-event.h', | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,6 +1,7 @@ | |||
| 1 | 1 | { | |
| 2 | 2 | 'variables': { | |
| 3 | 3 | 'v8_use_snapshot%': 'false', | |
| 4 | + 'v8_use_siphash%': 'true', | ||
| 4 | 5 | 'v8_trace_maps%': 0, | |
| 5 | 6 | 'node_use_dtrace%': 'false', | |
| 6 | 7 | 'node_use_etw%': 'false', | |
0 commit comments