Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: cherry-pick fix for 1234764 from v8 (#30587)
* chore: cherry-pick fix for 1234764 from v8 * chore: update patches Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
- Loading branch information
1 parent
ee1030e
commit 80dc038
Showing
2 changed files
with
47 additions
and
0 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
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,43 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Georg Neis <neis@chromium.org> | ||
Date: Tue, 10 Aug 2021 09:29:33 +0200 | ||
Subject: Merged: [compiler] Harden | ||
JSCallReducer::ReduceArrayIteratorPrototypeNext | ||
|
||
Revision: 65b20a0e65e1078f5dd230a5203e231bec790ab4 | ||
|
||
BUG=chromium:1234764 | ||
NOTRY=true | ||
NOPRESUBMIT=true | ||
NOTREECHECKS=true | ||
R=vahl@chromium.org | ||
|
||
Change-Id: I45faf253695011092de144c8e29bafac5337adec | ||
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3084363 | ||
Reviewed-by: Lutz Vahl <vahl@chromium.org> | ||
Commit-Queue: Georg Neis <neis@chromium.org> | ||
Cr-Commit-Position: refs/branch-heads/9.2@{#53} | ||
Cr-Branched-From: 51238348f95a1f5e0acc321efac7942d18a687a2-refs/heads/9.2.230@{#1} | ||
Cr-Branched-From: 587a04f02ab0487d194b55a7137dc2045e071597-refs/heads/master@{#74656} | ||
|
||
diff --git a/src/compiler/js-call-reducer.cc b/src/compiler/js-call-reducer.cc | ||
index bb7a11d16dc70ef5747b3c0b9f1d99acb0be7adf..459c7fcfab156026f383abe086646e1046abd5cc 100644 | ||
--- a/src/compiler/js-call-reducer.cc | ||
+++ b/src/compiler/js-call-reducer.cc | ||
@@ -5947,11 +5947,12 @@ Reduction JSCallReducer::ReduceArrayIteratorPrototypeNext(Node* node) { | ||
Node* etrue = effect; | ||
Node* if_true = graph()->NewNode(common()->IfTrue(), branch); | ||
{ | ||
- // We know that the {index} is range of the {length} now. | ||
+ // This extra check exists to refine the type of {index} but also to break | ||
+ // an exploitation technique that abuses typer mismatches. | ||
index = etrue = graph()->NewNode( | ||
- common()->TypeGuard( | ||
- Type::Range(0.0, length_access.type.Max() - 1.0, graph()->zone())), | ||
- index, etrue, if_true); | ||
+ simplified()->CheckBounds(p.feedback(), | ||
+ CheckBoundsFlag::kAbortOnOutOfBounds), | ||
+ index, length, etrue, if_true); | ||
|
||
done_true = jsgraph()->FalseConstant(); | ||
if (iteration_kind == IterationKind::kKeys) { |