eof: Fix CALLF runtime stack overflow check #677
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
3 tasks
|
State tests have incorrect expectations https://github.com/ethereum/tests/pull/1238/files#r1279089894 Upd. Fixed in https://github.com/ipsilon/tests/tree/runtime-stackoverflow-fix |
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #677 +/- ##
==========================================
+ Coverage 97.43% 97.45% +0.01%
==========================================
Files 83 83
Lines 8042 8065 +23
==========================================
+ Hits 7836 7860 +24
+ Misses 206 205 -1
Flags with carried forward coverage won't be shown. Click here to find out more.
|
chfast
reviewed
Jul 31, 2023
lib/evmone/instructions.hpp
Outdated
| @@ -1025,7 +1025,8 @@ inline code_iterator callf(StackTop stack, ExecutionState& state, code_iterator | |||
| const auto index = read_uint16_be(&pos[1]); | |||
| const auto& header = state.analysis.baseline->eof_header; | |||
| const auto stack_size = &stack.top() - state.stack_space.bottom(); | |||
| if (stack_size + header.types[index].max_stack_height > StackSpace::limit) | |||
| if (stack_size + header.types[index].max_stack_height - header.types[index].inputs > | |||
There was a problem hiding this comment.
Maybe add variable const auto callee_required_stack_size = header.types[index].max_stack_height - header.types[index].inputs;
Current stack height and callee's max_stack_height include inputs, we must not double-count them.
gumb0
force-pushed
the
callf-stackoverflow-runtime-check
branch
from
2b6f009
to
837ddea
Compare
chfast
approved these changes
Jul 31, 2023
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.
We were double counting the callee's inputs (both current stack height and callee's max_stack_height include inputs)
(Similar fix is needed for validation-time check and for JUMPF, but those are not merged yet)