xplat: enforce TypedArray bound check in AsmJs #1703
Merged
Conversation
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
|
@MikeHolman Could you please help review? |
MikeHolman
suggested changes
Oct 6, 2016
| @@ -159,6 +159,11 @@ AsmJsJITInfo::UsesHeapBuffer() const | |||
| bool | |||
| AsmJsJITInfo::AccessNeedsBoundCheck(uint offset) const | |||
| { | |||
| #ifdef _WIN32 | |||
| // Normally, heap has min size of 0x10000, but if you use ChangeHeap, min heap size is increased to 0x1000000 | |||
| return offset >= 0x1000000 || (IsHeapBufferConst() && offset >= 0x10000); | |||
There was a problem hiding this comment.
There is runtime guarantee that any access less than this is in bounds, so don't need to exclude this from xplat
There was a problem hiding this comment.
Will revert this. (Looks I originally added this when my problem was the other piece not emitting bound check.)
| @@ -1152,7 +1157,10 @@ LowererMDArch::LowerAsmJsLdElemHelper(IR::Instr * instr, bool isSimdLoad /*= fal | |||
| } | |||
| Lowerer::InsertBranch(Js::OpCode::Br, loadLabel, helperLabel); | |||
|
|
|||
| lowererMD->m_lowerer->GenerateRuntimeError(loadLabel, JSERR_ArgumentOutOfRange, IR::HelperOp_RuntimeRangeError); | |||
| if (isSimdLoad) | |||
There was a problem hiding this comment.
else, you should move 0 into dst.
|
@MikeHolman Updated, thanks! |
MikeHolman
approved these changes
Oct 6, 2016
For xplat always do bound check for Ld/St TypedArray in AsmJs. Currently we don't support out of bound access violation recovery on non _WIN32.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For xplat, always do bound check for Ld/St TypedArray in AsmJs. Currently
we don't support out of bound access violation recovery on non _WIN32.