fix(EVM): Check the bytecode length on call (L-05) (#1181)

matter-labs · Jan 3, 2025 · 969886c · 969886c
1 parent 66c8e51
commit 969886c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/system-contracts/contracts/EvmEmulator.yul b/system-contracts/contracts/EvmEmulator.yul
@@ -2973,8 +2973,12 @@ object "EvmEmulator" {
                     getCodeAddress(), 
                     BYTECODE_OFFSET(), // destination offset
                     0, // source offset
-                    MAX_POSSIBLE_DEPLOYED_BYTECODE_LEN()
+                    add(MAX_POSSIBLE_DEPLOYED_BYTECODE_LEN(), 1) // so we can check that bytecode isn't too big
                 )
+
+                if gt(codeLen, MAX_POSSIBLE_DEPLOYED_BYTECODE_LEN()) {
+                    panic()
+                }
 
                 mstore(EMPTY_CODE_OFFSET(), 0)
                 mstore(BYTECODE_LEN_OFFSET(), codeLen)

diff --git a/system-contracts/evm-emulator/EvmEmulator.template.yul b/system-contracts/evm-emulator/EvmEmulator.template.yul
@@ -114,8 +114,12 @@ object "EvmEmulator" {
                     getCodeAddress(), 
                     BYTECODE_OFFSET(), // destination offset
                     0, // source offset
-                    MAX_POSSIBLE_DEPLOYED_BYTECODE_LEN()
+                    add(MAX_POSSIBLE_DEPLOYED_BYTECODE_LEN(), 1) // so we can check that bytecode isn't too big
                 )
+
+                if gt(codeLen, MAX_POSSIBLE_DEPLOYED_BYTECODE_LEN()) {
+                    panic()
+                }
 
                 mstore(EMPTY_CODE_OFFSET(), 0)
                 mstore(BYTECODE_LEN_OFFSET(), codeLen)