Skip to content

feat(InstanceContext): Avoid passing illegal pointers across CGo FFI … #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions wasmer/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,11 @@ func (instanceContext *InstanceContext) Memory() *Memory {
return &instanceContext.memory
}

// Data returns the instance context data as an `unsafe.Pointer`. It's
// up to the user to cast it appropriately as a pointer to a data.
func (instanceContext *InstanceContext) Data() unsafe.Pointer {
return cWasmerInstanceContextDataGet(instanceContext.context)
// Data returns the instance context data as an `interface{}`. It's up to the
// user to assert the proper type.
func (instanceContext *InstanceContext) Data() interface{} {
ctxDataIdx := *(*int)(cWasmerInstanceContextDataGet(instanceContext.context))
ctxDataMtx.RLock()
defer ctxDataMtx.RUnlock()
return ctxData[ctxDataIdx]
}
44 changes: 42 additions & 2 deletions wasmer/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package wasmer

import (
"fmt"
"runtime"
"sync"
"unsafe"
)

Expand Down Expand Up @@ -71,6 +73,8 @@ type Instance struct {

// The exported memory of a WebAssembly instance.
Memory *Memory

ctxDataIdx *int
}

// NewInstance constructs a new `Instance` with no imported functions.
Expand Down Expand Up @@ -419,14 +423,50 @@ func (instance *Instance) HasMemory() bool {
return nil != instance.Memory
}

var (
// In order to avoid passing illegal Go pointers across the CGo FFI,
// store Instance Context Data in ctxData and simply pass the index
// through the FFI instead.
//
// See Instance.SetContextData and InstanceContext.Data.
ctxData = make(map[int]interface{})
nextCtxDataIdx int
ctxDataMtx sync.RWMutex
)

// SetContextData assigns a data that can be used by all imported
// functions. Indeed, each imported function receives as its first
// argument an instance context (see `InstanceContext`). An instance
// context can hold a pointer to any kind of data. It is important to
// understand that this data is shared by all imported function, it's
// global to the instance.
func (instance *Instance) SetContextData(data unsafe.Pointer) {
cWasmerInstanceContextDataSet(instance.instance, data)
func (instance *Instance) SetContextData(data interface{}) {
ctxDataMtx.Lock()
if instance.ctxDataIdx == nil {
instance.ctxDataIdx = new(int)
*instance.ctxDataIdx = nextCtxDataIdx
nextCtxDataIdx++

// When instance is GC'd, clean up its ctxData.
// Set the finalizer on the unexported instance.ctxDataIdx,
// instead of directly on the instance, to allow users of this
// package to set their own finalizer on the Instance for other
// reasons.
runtime.SetFinalizer(instance.ctxDataIdx, func(idx *int) {
// Launch a goroutine to avoid blocking other
// finalizers while waiting for the mutex lock.
go func() {
ctxDataMtx.Lock()
delete(ctxData, *idx)
ctxDataMtx.Unlock()
}()
})
}
ctxData[*instance.ctxDataIdx] = data
ctxDataMtx.Unlock()

cWasmerInstanceContextDataSet(instance.instance,
unsafe.Pointer(instance.ctxDataIdx))
}

// Close closes/frees an `Instance`.
Expand Down
4 changes: 2 additions & 2 deletions wasmer/test/imports.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ func testImportInstanceContext(t *testing.T) {
func logMessageWithContextData(context unsafe.Pointer, pointer int32, length int32) {
var instanceContext = wasm.IntoInstanceContext(context)
var memory = instanceContext.Memory().Data()
var logMessage = (*logMessageContext)(instanceContext.Data())
var logMessage = instanceContext.Data().(*logMessageContext)

logMessage.message = string(memory[pointer : pointer+length])
}
Expand All @@ -245,7 +245,7 @@ func testImportInstanceContextData(t *testing.T) {
defer instance.Close()

contextData := logMessageContext{message: "first"}
instance.SetContextData(unsafe.Pointer(&contextData))
instance.SetContextData(&contextData)

doSomething := instance.Exports["do_something"]

Expand Down