Add srcOffset overflow handling

matter-labs · Oct 30, 2024 · a186279 · a186279
1 parent 8e0ec51
commit a186279
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/system-contracts/contracts/EvmEmulator.yul b/system-contracts/contracts/EvmEmulator.yul
@@ -175,6 +175,10 @@ object "EvmEmulator" {
             max_uint := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
         }
 
+        function MAX_UINT64() -> max {
+            max := sub(shl(64, 1), 1)
+        }
+
         // Each evm gas is 5 zkEVM one
         function GAS_DIVISOR() -> gas_div { gas_div := 5 }
 
@@ -1657,6 +1661,10 @@ object "EvmEmulator" {
 
                     evmGasLeft := chargeGas(evmGasLeft, dynamicGas)
 
+                    if gt(srcOffset, MAX_UINT64()) {
+                        srcOffset := MAX_UINT64()
+                    } 
+
                     if gt(len, 0) {
                         let realCodeLen
                         if getRawCodeHash(addr) {
@@ -3177,6 +3185,10 @@ object "EvmEmulator" {
                 max_uint := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
             }
 
+            function MAX_UINT64() -> max {
+                max := sub(shl(64, 1), 1)
+            }
+
             // Each evm gas is 5 zkEVM one
             function GAS_DIVISOR() -> gas_div { gas_div := 5 }
 
@@ -4659,6 +4671,10 @@ object "EvmEmulator" {
 
                         evmGasLeft := chargeGas(evmGasLeft, dynamicGas)
 
+                        if gt(srcOffset, MAX_UINT64()) {
+                            srcOffset := MAX_UINT64()
+                        } 
+
                         if gt(len, 0) {
                             let realCodeLen
                             if getRawCodeHash(addr) {

diff --git a/system-contracts/evm-emulator/EvmEmulatorFunctions.template.yul b/system-contracts/evm-emulator/EvmEmulatorFunctions.template.yul
@@ -113,6 +113,10 @@ function MAX_UINT() -> max_uint {
     max_uint := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 }
 
+function MAX_UINT64() -> max {
+    max := sub(shl(64, 1), 1)
+}
+
 // Each evm gas is 5 zkEVM one
 function GAS_DIVISOR() -> gas_div { gas_div := 5 }
 

diff --git a/system-contracts/evm-emulator/EvmEmulatorLoop.template.yul b/system-contracts/evm-emulator/EvmEmulatorLoop.template.yul
@@ -457,6 +457,10 @@ for { } true { } {
 
         evmGasLeft := chargeGas(evmGasLeft, dynamicGas)
 
+        if gt(srcOffset, MAX_UINT64()) {
+            srcOffset := MAX_UINT64()
+        } 
+
         if gt(len, 0) {
             let realCodeLen
             if getRawCodeHash(addr) {