forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

vm: Make sure allocated mem is freed between calls

Browse source
This commit is contained in:
Guillaume Ballet 2019-06-03 12:24:01 +02:00
parent 58aa55e2ea
commit 33a87d5fcc
1 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
core/vm/aot.go
View file

@ -133,14 +133,20 @@ func (ac *AoTContract) Run(input []byte, contract *Contract) ([]byte, error) {
dumpText = false dumpText = false
) )
progReader := bytes.NewReader(input) progReader := bytes.NewReader(ac.Code)
vecSize := alignSize(len(ac.ImportVector), os.Getpagesize()) vecSize := alignSize(len(ac.ImportVector), os.Getpagesize())
vecTextMem, err := makeMem(vecSize+textSize, syscall.PROT_READ|syscall.PROT_WRITE, 0) vecTextMem, err := makeMem(vecSize+textSize, syscall.PROT_READ|syscall.PROT_WRITE, 0)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal("error allocating vector+text memory: ", err)
} }
defer func() {
err = syscall.Munmap(vecTextMem)
if err != nil {
log.Fatal("error freeing vector+text memory", err)
}
}()
vecMem := vecTextMem[:vecSize] vecMem := vecTextMem[:vecSize]
copy(vecMem[vecSize-len(ac.ImportVector):], ac.ImportVector) copy(vecMem[vecSize-len(ac.ImportVector):], ac.ImportVector)
@ -169,19 +175,25 @@ func (ac *AoTContract) Run(input []byte, contract *Contract) ([]byte, error) {
} }
} }
if err != nil { if err != nil {
log.Fatal(err) log.Fatal("Error compiling the program:", err)
} }
binary.LittleEndian.PutUint64(ac.ImportVector[40:], uint64(obj.InitialMemorySize)) binary.LittleEndian.PutUint64(ac.ImportVector[40:], uint64(obj.InitialMemorySize))
globalsMemory, err := makeMem(obj.MemoryOffset+linearMemoryAddressSpace, syscall.PROT_NONE, 0) globalsMemory, err := makeMem(obj.MemoryOffset+linearMemoryAddressSpace, syscall.PROT_NONE, 0)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal("error allocating memory for globals:", err)
} }
defer func() {
err = syscall.Munmap(globalsMemory)
if err != nil {
log.Fatal("error freeing globals:", err)
}
}()
err = syscall.Mprotect(globalsMemory[:obj.MemoryOffset+obj.InitialMemorySize], syscall.PROT_READ|syscall.PROT_WRITE) err = syscall.Mprotect(globalsMemory[:obj.MemoryOffset+obj.InitialMemorySize], syscall.PROT_READ|syscall.PROT_WRITE)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal("error changing globals mem protection:", err)
} }
copy(globalsMemory, obj.GlobalsMemory) copy(globalsMemory, obj.GlobalsMemory)
@ -189,17 +201,23 @@ func (ac *AoTContract) Run(input []byte, contract *Contract) ([]byte, error) {
memoryAddr := memAddr(globalsMemory) + uintptr(obj.MemoryOffset) memoryAddr := memAddr(globalsMemory) + uintptr(obj.MemoryOffset)
if err := syscall.Mprotect(vecMem, syscall.PROT_READ); err != nil { if err := syscall.Mprotect(vecMem, syscall.PROT_READ); err != nil {
log.Fatal(err) log.Fatal("error changing protection for vector memory:", err)
} }
if err := syscall.Mprotect(textMem, syscall.PROT_READ|syscall.PROT_EXEC); err != nil { if err := syscall.Mprotect(textMem, syscall.PROT_READ|syscall.PROT_EXEC); err != nil {
log.Fatal(err) log.Fatal("error changing text segment protection: ", err)
} }
stackMem, err := makeMem(stackSize, syscall.PROT_READ|syscall.PROT_WRITE, syscall.MAP_STACK) stackMem, err := makeMem(stackSize, syscall.PROT_READ|syscall.PROT_WRITE, syscall.MAP_STACK)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal("error allocating memory for the contract stack: ", err)
} }
defer func() {
err = syscall.Munmap(stackMem)
if err != nil {
log.Fatal("error freeing contract stack:", err)
}
}()
stackOffset := stackSize - len(obj.StackFrame) stackOffset := stackSize - len(obj.StackFrame)
copy(stackMem[stackOffset:], obj.StackFrame) copy(stackMem[stackOffset:], obj.StackFrame)