Merge remote-tracking branch 'official/master' into HEAD

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+## v1.1.2
+Security
+* [\#379](https://github.com/binance-chain/bsc/pull/379) A pre-announced hotfix release to patch a vulnerability in the EVM (CVE-2021-39137).
+
 
 ## v1.1.1
 IMPROVEMENT

core/vm/analysis.go

@@ -16,17 +16,49 @@
 
 package vm
 
+const (
+ set2BitsMask = uint16(0b1100_0000_0000_0000)
+ set3BitsMask = uint16(0b1110_0000_0000_0000)
+ set4BitsMask = uint16(0b1111_0000_0000_0000)
+ set5BitsMask = uint16(0b1111_1000_0000_0000)
+ set6BitsMask = uint16(0b1111_1100_0000_0000)
+ set7BitsMask = uint16(0b1111_1110_0000_0000)
+)
+
 // bitvec is a bit vector which maps bytes in a program.
 // An unset bit means the byte is an opcode, a set bit means
 // it's data (i.e. argument of PUSHxx).
 type bitvec []byte
 
-func (bits *bitvec) set(pos uint64) {
- (*bits)[pos/8] |= 0x80 >> (pos % 8)
+var lookup = [8]byte{
+ 0x80, 0x40, 0x20, 0x10, 0x8, 0x4, 0x2, 0x1,
+}
+
+func (bits bitvec) set1(pos uint64) {
+ bits[pos/8] |= lookup[pos%8]
+}
+
+func (bits bitvec) setN(flag uint16, pos uint64) {
+ a := flag >> (pos % 8)
+ bits[pos/8] |= byte(a >> 8)
+ if b := byte(a); b != 0 {
+ // If the bit-setting affects the neighbouring byte, we can assign - no need to OR it,
+ // since it's the first write to that byte
+ bits[pos/8+1] = b
+ }
+}
+
+func (bits bitvec) set8(pos uint64) {
+ a := byte(0xFF >> (pos % 8))
+ bits[pos/8] |= a
+ bits[pos/8+1] = ^a
 }
-func (bits *bitvec) set8(pos uint64) {
- (*bits)[pos/8] |= 0xFF >> (pos % 8)
- (*bits)[pos/8+1] |= ^(0xFF >> (pos % 8))
+
+func (bits bitvec) set16(pos uint64) {
+ a := byte(0xFF >> (pos % 8))
+ bits[pos/8] |= a
+ bits[pos/8+1] = 0xFF
+ bits[pos/8+2] = ^a
 }
 
 // codeSegment checks if the position is in a code segment.
@@ -40,22 +72,52 @@ func codeBitmap(code []byte) bitvec {
  // ends with a PUSH32, the algorithm will push zeroes onto the
  // bitvector outside the bounds of the actual code.
  bits := make(bitvec, len(code)/8+1+4)
+ return codeBitmapInternal(code, bits)
+}
+
+// codeBitmapInternal is the internal implementation of codeBitmap.
+// It exists for the purpose of being able to run benchmark tests
+// without dynamic allocations affecting the results.
+func codeBitmapInternal(code, bits bitvec) bitvec {
  for pc := uint64(0); pc < uint64(len(code)); {
  op := OpCode(code[pc])
-
- if op >= PUSH1 && op <= PUSH32 {
- numbits := op - PUSH1 + 1
- pc++
+ pc++
+ if op < PUSH1 || op > PUSH32 {
+ continue
+ }
+ numbits := op - PUSH1 + 1
+ if numbits >= 8 {
+ for ; numbits >= 16; numbits -= 16 {
+ bits.set16(pc)
+ pc += 16
+ }
  for ; numbits >= 8; numbits -= 8 {
- bits.set8(pc) // 8
+ bits.set8(pc)
  pc += 8
  }
- for ; numbits > 0; numbits-- {
- bits.set(pc)
- pc++
- }
- } else {
- pc++
+ }
+ switch numbits {
+ case 1:
+ bits.set1(pc)
+ pc += 1
+ case 2:
+ bits.setN(set2BitsMask, pc)
+ pc += 2
+ case 3:
+ bits.setN(set3BitsMask, pc)
+ pc += 3
+ case 4:
+ bits.setN(set4BitsMask, pc)
+ pc += 4
+ case 5:
+ bits.setN(set5BitsMask, pc)
+ pc += 5
+ case 6:
+ bits.setN(set6BitsMask, pc)
+ pc += 6
+ case 7:
+ bits.setN(set7BitsMask, pc)
+ pc += 7
  }
  }
  return bits

core/vm/analysis_test.go

@@ -47,10 +47,10 @@ func TestJumpDestAnalysis(t *testing.T) {
  {[]byte{byte(PUSH32)}, 0xFF, 1},
  {[]byte{byte(PUSH32)}, 0xFF, 2},
  }
- for _, test := range tests {
+ for i, test := range tests {
  ret := codeBitmap(test.code)
  if ret[test.which] != test.exp {
- t.Fatalf("expected %x, got %02x", test.exp, ret[test.which])
+ t.Fatalf("test %d: expected %x, got %02x", i, test.exp, ret[test.which])
  }
  }
 }
@@ -73,3 +73,23 @@ func BenchmarkJumpdestHashing_1200k(bench *testing.B) {
  }
  bench.StopTimer()
 }
+
+func BenchmarkJumpdestOpAnalysis(bench *testing.B) {
+ var op OpCode
+ bencher := func(b *testing.B) {
+ code := make([]byte, 32*b.N)
+ for i := range code {
+ code[i] = byte(op)
+ }
+ bits := make(bitvec, len(code)/8+1+4)
+ b.ResetTimer()
+ codeBitmapInternal(code, bits)
+ }
+ for op = PUSH1; op <= PUSH32; op++ {
+ bench.Run(op.String(), bencher)
+ }
+ op = JUMPDEST
+ bench.Run(op.String(), bencher)
+ op = STOP
+ bench.Run(op.String(), bencher)
+}

core/vm/instructions.go

@@ -669,6 +669,7 @@ func opCall(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byt
  }
  stack.push(&temp)
  if err == nil || err == ErrExecutionReverted {
+ ret = common.CopyBytes(ret)
  scope.Memory.Set(retOffset.Uint64(), retSize.Uint64(), ret)
  }
  scope.Contract.Gas += returnGas
@@ -703,6 +704,7 @@ func opCallCode(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([
  }
  stack.push(&temp)
  if err == nil || err == ErrExecutionReverted {
+ ret = common.CopyBytes(ret)
  scope.Memory.Set(retOffset.Uint64(), retSize.Uint64(), ret)
  }
  scope.Contract.Gas += returnGas
@@ -730,6 +732,7 @@ func opDelegateCall(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext
  }
  stack.push(&temp)
  if err == nil || err == ErrExecutionReverted {
+ ret = common.CopyBytes(ret)
  scope.Memory.Set(retOffset.Uint64(), retSize.Uint64(), ret)
  }
  scope.Contract.Gas += returnGas
@@ -757,6 +760,7 @@ func opStaticCall(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext)
  }
  stack.push(&temp)
  if err == nil || err == ErrExecutionReverted {
+ ret = common.CopyBytes(ret)
  scope.Memory.Set(retOffset.Uint64(), retSize.Uint64(), ret)
  }
  scope.Contract.Gas += returnGas

eth/state_accessor.go

@@ -19,9 +19,11 @@ package eth
 import (
  "errors"
  "fmt"
+ "math/big"
  "time"
 
  "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/consensus"
  "github.com/ethereum/go-ethereum/core"
  "github.com/ethereum/go-ethereum/core/state"
  "github.com/ethereum/go-ethereum/core/types"
@@ -170,6 +172,14 @@ func (eth *Ethereum) stateAtTransaction(block *types.Block, txIndex int, reexec
  }
  // Not yet the searched for transaction, execute on top of the current state
  vmenv := vm.NewEVM(context, txContext, statedb, eth.blockchain.Config(), vm.Config{})
+ if posa, ok := eth.Engine().(consensus.PoSA); ok && msg.From() == context.Coinbase &&
+ posa.IsSystemContract(msg.To()) && msg.GasPrice().Cmp(big.NewInt(0)) == 0 {
+ balance := statedb.GetBalance(consensus.SystemAddress)
+ if balance.Cmp(common.Big0) > 0 {
+ statedb.SetBalance(consensus.SystemAddress, big.NewInt(0))
+ statedb.AddBalance(context.Coinbase, balance)
+ }
+ }
  statedb.Prepare(tx.Hash(), block.Hash(), idx)
  if _, err := core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(tx.Gas())); err != nil {
  return nil, vm.BlockContext{}, nil, fmt.Errorf("transaction %#x failed: %v", tx.Hash(), err)

eth/tracers/api.go

@@ -673,6 +673,15 @@ func (api *API) standardTraceBlockToFile(ctx context.Context, block *types.Block
  }
  // Execute the transaction and flush any traces to disk
  vmenv := vm.NewEVM(vmctx, txContext, statedb, chainConfig, vmConf)
+ if posa, ok := api.backend.Engine().(consensus.PoSA); ok {
+ if isSystem, _ := posa.IsSystemTransaction(tx, block.Header()); isSystem {
+ balance := statedb.GetBalance(consensus.SystemAddress)
+ if balance.Cmp(common.Big0) > 0 {
+ statedb.SetBalance(consensus.SystemAddress, big.NewInt(0))
+ statedb.AddBalance(vmctx.Coinbase, balance)
+ }
+ }
+ }
  statedb.Prepare(tx.Hash(), block.Hash(), i)
  _, err = core.ApplyMessage(vmenv, msg, new(core.GasPool).AddGas(msg.Gas()))
  if writer != nil {

params/version.go

@@ -23,7 +23,7 @@ import (
 const (
  VersionMajor = 1 // Major version component of the current release
  VersionMinor = 1 // Minor version component of the current release
- VersionPatch = 1 // Patch version component of the current release
+ VersionPatch = 2 // Patch version component of the current release
  VersionMeta = "" // Version metadata to append to the version string
 )