forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-05-19 22:40:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Limit EXTCODECOPY to eof bytes

Browse source 
When copying EOF contracts, make sure EXTCODECOPY only has access to the EOF magic, not just two bytes total.
This commit is contained in:
Danno Ferrin 2024-10-25 12:27:23 -06:00
parent 56ff85a808
commit 1156ca42f2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/vm/instructions.go
View file

@ -395,6 +395,7 @@ func opExtCodeCopy(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext)
codeOffset = stack.pop() codeOffset = stack.pop()
length = stack.pop() length = stack.pop()
lengthU64 = length.Uint64() lengthU64 = length.Uint64()
codeCopy []byte
) )
uint64CodeOffset, overflow := codeOffset.Uint64WithOverflow() uint64CodeOffset, overflow := codeOffset.Uint64WithOverflow()
if overflow { if overflow {
@ -406,9 +407,10 @@ func opExtCodeCopy(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext)
witness.AddCode(code) witness.AddCode(code)
} }
if isEOFVersion1(code) { if isEOFVersion1(code) {
lengthU64 = 2 codeCopy = getData(eofMagic, uint64CodeOffset, lengthU64)
} else {
codeCopy = getData(code, uint64CodeOffset, lengthU64)
} }
codeCopy := getData(code, uint64CodeOffset, lengthU64)
scope.Memory.Set(memOffset.Uint64(), lengthU64, codeCopy) scope.Memory.Set(memOffset.Uint64(), lengthU64, codeCopy)
return nil, nil return nil, nil