mirror of https://github.com/status-im/op-geth.git
core/vm: deepcopy jumptable when enabling extra eips (#26137)
When the interpreter is configured to use extra-eips, this change makes it so that all the opcodes are deep-copied, to prevent accidental modification of the 'base' jumptable. Closes: #26136 Co-authored-by: Martin Holst Swende <martin@swende.se>
This commit is contained in:
parent
6685f88455
commit
7dc5e785a8
|
@ -82,15 +82,17 @@ func NewEVMInterpreter(evm *EVM, cfg Config) *EVMInterpreter {
|
||||||
cfg.JumpTable = &frontierInstructionSet
|
cfg.JumpTable = &frontierInstructionSet
|
||||||
}
|
}
|
||||||
var extraEips []int
|
var extraEips []int
|
||||||
|
if len(cfg.ExtraEips) > 0 {
|
||||||
|
// Deep-copy jumptable to prevent modification of opcodes in other tables
|
||||||
|
cfg.JumpTable = copyJumpTable(cfg.JumpTable)
|
||||||
|
}
|
||||||
for _, eip := range cfg.ExtraEips {
|
for _, eip := range cfg.ExtraEips {
|
||||||
copy := *cfg.JumpTable
|
if err := EnableEIP(eip, cfg.JumpTable); err != nil {
|
||||||
if err := EnableEIP(eip, ©); err != nil {
|
|
||||||
// Disable it, so caller can check if it's activated or not
|
// Disable it, so caller can check if it's activated or not
|
||||||
log.Error("EIP activation failed", "eip", eip, "error", err)
|
log.Error("EIP activation failed", "eip", eip, "error", err)
|
||||||
} else {
|
} else {
|
||||||
extraEips = append(extraEips, eip)
|
extraEips = append(extraEips, eip)
|
||||||
}
|
}
|
||||||
cfg.JumpTable = ©
|
|
||||||
}
|
}
|
||||||
cfg.ExtraEips = extraEips
|
cfg.ExtraEips = extraEips
|
||||||
}
|
}
|
||||||
|
|
|
@ -1043,3 +1043,14 @@ func newFrontierInstructionSet() JumpTable {
|
||||||
|
|
||||||
return validate(tbl)
|
return validate(tbl)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func copyJumpTable(source *JumpTable) *JumpTable {
|
||||||
|
dest := *source
|
||||||
|
for i, op := range source {
|
||||||
|
if op != nil {
|
||||||
|
opCopy := *op
|
||||||
|
dest[i] = &opCopy
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return &dest
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
// Copyright 2022 The go-ethereum Authors
|
||||||
|
// This file is part of the go-ethereum library.
|
||||||
|
//
|
||||||
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU Lesser General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Lesser General Public License
|
||||||
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package vm
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestJumpTableCopy tests that deep copy is necessery to prevent modify shared jump table
|
||||||
|
func TestJumpTableCopy(t *testing.T) {
|
||||||
|
tbl := newMergeInstructionSet()
|
||||||
|
require.Equal(t, uint64(0), tbl[SLOAD].constantGas)
|
||||||
|
|
||||||
|
// a deep copy won't modify the shared jump table
|
||||||
|
deepCopy := copyJumpTable(&tbl)
|
||||||
|
deepCopy[SLOAD].constantGas = 100
|
||||||
|
require.Equal(t, uint64(100), deepCopy[SLOAD].constantGas)
|
||||||
|
require.Equal(t, uint64(0), tbl[SLOAD].constantGas)
|
||||||
|
}
|
Loading…
Reference in New Issue