deps: V8: cherry-pick e0a109c

joyeecheung · BridgeAR · commit 9382b3be9c4d · 2019-06-17T21:12:22.000+02:00
Original commit message: [api] Implement StartupData::CanBeRehashed() for the snapshot blob This enables the embedder to check if the snapshot generated from SnapshotCreator::CreateBlob() can be rehashed and the seed can be recomputed during deserialization. The lack of this functionality resulted in a temporary vunerability in Node.js: #27365 Change-Id: I88d52337217c40f79c26438be3c87d2db874d980 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1578661 Commit-Queue: Joyee Cheung <joyee@igalia.com> Reviewed-by: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/master@{#61175} Refs: v8/v8@e0a109c PR-URL: #27533 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Refael Ackermann (רפאל פלחי) <refack@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/common.gypi b/common.gypi
@@ -38,7 +38,7 @@
 
     # Reset this number to 0 on major V8 upgrades.
     # Increment by one for each non-official patch applied to deps/v8.
-    'v8_embedder_string': '-node.13',
+    'v8_embedder_string': '-node.14',
 
     ##### V8 defaults for Node.js #####
 
diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h
@@ -8605,6 +8605,13 @@ class V8_EXPORT Isolate {
 
 class V8_EXPORT StartupData {
  public:
+  /**
+   * Whether the data created can be rehashed and and the hash seed can be
+   * recomputed when deserialized.
+   * Only valid for StartupData returned by SnapshotCreator::CreateBlob().
+   */
+  bool CanBeRehashed() const;
+
   const char* data;
   int raw_size;
 };
diff --git a/deps/v8/src/api.cc b/deps/v8/src/api.cc
@@ -887,6 +887,11 @@ StartupData SnapshotCreator::CreateBlob(
   return result;
 }
 
+bool StartupData::CanBeRehashed() const {
+  DCHECK(i::Snapshot::VerifyChecksum(this));
+  return i::Snapshot::ExtractRehashability(this);
+}
+
 void V8::SetDcheckErrorHandler(DcheckErrorCallback that) {
   v8::base::SetDcheckFunction(that);
 }
diff --git a/deps/v8/src/snapshot/snapshot-common.cc b/deps/v8/src/snapshot/snapshot-common.cc
@@ -229,7 +229,9 @@ uint32_t Snapshot::ExtractContextOffset(const v8::StartupData* data,
 
 bool Snapshot::ExtractRehashability(const v8::StartupData* data) {
   CHECK_LT(kRehashabilityOffset, static_cast<uint32_t>(data->raw_size));
-  return GetHeaderValue(data, kRehashabilityOffset) != 0;
+  uint32_t rehashability = GetHeaderValue(data, kRehashabilityOffset);
+  CHECK_IMPLIES(rehashability != 0, rehashability == 1);
+  return rehashability != 0;
 }
 
 namespace {
diff --git a/deps/v8/src/snapshot/snapshot.h b/deps/v8/src/snapshot/snapshot.h
@@ -87,11 +87,12 @@ class Snapshot : public AllStatic {
   static bool SnapshotIsValid(const v8::StartupData* snapshot_blob);
 #endif  // DEBUG
 
+  static bool ExtractRehashability(const v8::StartupData* data);
+
  private:
   static uint32_t ExtractNumContexts(const v8::StartupData* data);
   static uint32_t ExtractContextOffset(const v8::StartupData* data,
                                        uint32_t index);
-  static bool ExtractRehashability(const v8::StartupData* data);
   static Vector<const byte> ExtractStartupData(const v8::StartupData* data);
   static Vector<const byte> ExtractReadOnlyData(const v8::StartupData* data);
   static Vector<const byte> ExtractContextData(const v8::StartupData* data,
diff --git a/deps/v8/test/cctest/test-serialize.cc b/deps/v8/test/cctest/test-serialize.cc
@@ -3709,6 +3709,7 @@ UNINITIALIZED_TEST(ReinitializeHashSeedNotRehashable) {
     }
     blob =
         creator.CreateBlob(v8::SnapshotCreator::FunctionCodeHandling::kClear);
+    CHECK(!blob.CanBeRehashed());
   }
 
   i::FLAG_hash_seed = 1337;
@@ -3774,6 +3775,7 @@ UNINITIALIZED_TEST(ReinitializeHashSeedRehashable) {
     }
     blob =
         creator.CreateBlob(v8::SnapshotCreator::FunctionCodeHandling::kClear);
+    CHECK(blob.CanBeRehashed());
   }
 
   i::FLAG_hash_seed = 1337;

Original file line number	Diff line number	Diff line change
`@@ -887,6 +887,11 @@ StartupData SnapshotCreator::CreateBlob(`
`887`	`887`	`return result;`
`888`	`888`	`}`
`889`	`889`
	`890`	`+bool StartupData::CanBeRehashed() const {`
	`891`	`+ DCHECK(i::Snapshot::VerifyChecksum(this));`
	`892`	`+ return i::Snapshot::ExtractRehashability(this);`
	`893`	`+}`
	`894`	`+`
`890`	`895`	`void V8::SetDcheckErrorHandler(DcheckErrorCallback that) {`
`891`	`896`	`v8::base::SetDcheckFunction(that);`
`892`	`897`	`}`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,9 @@ uint32_t Snapshot::ExtractContextOffset(const v8::StartupData* data,`
`229`	`229`
`230`	`230`	`bool Snapshot::ExtractRehashability(const v8::StartupData* data) {`
`231`	`231`	`CHECK_LT(kRehashabilityOffset, static_cast<uint32_t>(data->raw_size));`
`232`		`- return GetHeaderValue(data, kRehashabilityOffset) != 0;`
	`232`	`+ uint32_t rehashability = GetHeaderValue(data, kRehashabilityOffset);`
	`233`	`+ CHECK_IMPLIES(rehashability != 0, rehashability == 1);`
	`234`	`+ return rehashability != 0;`
`233`	`235`	`}`
`234`	`236`
`235`	`237`	`namespace {`
Original file line number	Diff line number	Diff line change
`@@ -3709,6 +3709,7 @@ UNINITIALIZED_TEST(ReinitializeHashSeedNotRehashable) {`
`3709`	`3709`	`}`
`3710`	`3710`	`blob =`
`3711`	`3711`	`creator.CreateBlob(v8::SnapshotCreator::FunctionCodeHandling::kClear);`
	`3712`	`+ CHECK(!blob.CanBeRehashed());`
`3712`	`3713`	`}`
`3713`	`3714`
`3714`	`3715`	`i::FLAG_hash_seed = 1337;`
`@@ -3774,6 +3775,7 @@ UNINITIALIZED_TEST(ReinitializeHashSeedRehashable) {`
`3774`	`3775`	`}`
`3775`	`3776`	`blob =`
`3776`	`3777`	`creator.CreateBlob(v8::SnapshotCreator::FunctionCodeHandling::kClear);`
	`3778`	`+ CHECK(blob.CanBeRehashed());`
`3777`	`3779`	`}`
`3778`	`3780`
`3779`	`3781`	`i::FLAG_hash_seed = 1337;`