Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix DATALOADN truncated immediate validation #663

Merged
merged 2 commits into from
Jun 18, 2023
Merged

Fix DATALOADN truncated immediate validation #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48044f8
Fix DATALOADN truncated immediate validation
gumb0 Jun 6, 2023
6c08a08
Make RJUMPV's static part of immediate checked via instr::traits
gumb0 Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions lib/evmone/eof.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,15 +212,17 @@ EOFValidationError validate_instructions(
if (cost_table[op] == instr::undefined)
return EOFValidationError::undefined_instruction;

if (i + instr::traits[op].immediate_size >= code.size())
return EOFValidationError::truncated_instruction;

if (op == OP_RJUMPV)
{
if (i + 1 >= code.size())
return EOFValidationError::truncated_instruction;

const auto count = code[i + 1];
if (count < 1)
return EOFValidationError::invalid_rjumpv_count;
i += static_cast<size_t>(1 /* count */ + count * 2 /* tbl */);
if (i >= code.size())
return EOFValidationError::truncated_instruction;
}
else if (op == OP_DATALOADN)
{
Expand All @@ -231,9 +233,6 @@ EOFValidationError validate_instructions(
}
else
i += instr::traits[op].immediate_size;

if (i >= code.size())
return EOFValidationError::truncated_instruction;
}

return EOFValidationError::success;
Expand Down Expand Up @@ -275,7 +274,7 @@ bool validate_rjump_destinations(bytes_view code) noexcept
else if (op == OP_RJUMPV)
{
const auto count = code[i + 1];
imm_size += size_t{1} /* count */ + count * REL_OFFSET_SIZE /* tbl */;
imm_size += count * REL_OFFSET_SIZE /* tbl */;
const size_t post_pos = i + 1 + imm_size;

for (size_t k = 0; k < count * REL_OFFSET_SIZE; k += REL_OFFSET_SIZE)
Expand Down
2 changes: 1 addition & 1 deletion lib/evmone/instructions_traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ constexpr inline std::array<Traits, 256> traits = []() noexcept {
table[OP_RJUMP] = {"RJUMP", 2, false, 0, 0, EVMC_CANCUN};
table[OP_RJUMPI] = {"RJUMPI", 2, false, 1, -1, EVMC_CANCUN};
table[OP_RJUMPV] = {
"RJUMPV", 0 /* WARNING: immediate_size is dynamic */, false, 1, -1, EVMC_CANCUN};
"RJUMPV", 1 /* 1 byte static immediate + dynamic immediate */, false, 1, -1, EVMC_CANCUN};

table[OP_PUSH0] = {"PUSH0", 0, false, 0, 1, EVMC_SHANGHAI};

Expand Down
9 changes: 9 additions & 0 deletions test/unittests/eof_validation_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,6 +1248,15 @@ TEST(eof_validation, too_many_code_sections)
EXPECT_EQ(validate_eof(code), EOFValidationError::too_many_code_sections);
}

TEST(eof_validation, EOF1_dataloadn_truncated)
{
EXPECT_EQ(validate_eof("EF0001 010004 0200010001 030000 00 00000000 B9"),
EOFValidationError::truncated_instruction);

EXPECT_EQ(validate_eof("EF0001 010004 0200010002 030000 00 00000000 B900"),
EOFValidationError::truncated_instruction);
}

TEST(eof_validation, dataloadn)
{
// DATALOADN{0}
Expand Down
2 changes: 2 additions & 0 deletions test/unittests/instructions_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ constexpr void validate_traits_of() noexcept
static_assert(tr.immediate_size == Op - OP_PUSH1 + 1);
else if constexpr (Op == OP_RJUMP || Op == OP_RJUMPI || Op == OP_CALLF)
static_assert(tr.immediate_size == 2);
else if constexpr (Op == OP_RJUMPV)
static_assert(tr.immediate_size == 1);
else if constexpr (Op == OP_DUPN || Op == OP_SWAPN)
static_assert(tr.immediate_size == 1);
else if constexpr (Op == OP_DATALOADN)
Expand Down