mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/link: limit darwin dynlink symbol exports 

The pclntable contains pointers to functions. If the function symbol
is exported in a plugin, and there is a matching symbol in the host
binary, then the pclntable of a plugin ends up pointing at the
function in the host module.

This doesn't work because the traceback code expects the pointer to
be in the same module space as the PC value.

So don't export functions that might overlap with the host binary.
This way the pointer stays in its module.

Updates #18190

Change-Id: Ifb77605b35fb0a1e7edeecfd22b1e335ed4bb392
Reviewed-on: https://go-review.googlesource.com/34196
Run-TryBot: David Crawshaw <crawshaw@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
David Crawshaw 2016-12-09 12:38:34 -05:00
parent 4c71af71b4
commit ab5a2173f9
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
misc/cgo/testplugin/src/plugin1/plugin1.go
View File

@ -9,7 +9,10 @@ import "C"
import "common"
func F() int { return 3 }
func F() int {
_ = make([]byte, 1<<21) // trigger stack unwind, Issue #18190.
return 3
}
func ReadCommonX() int {
return common.X

24
src/cmd/link/internal/ld/macho.go
View File

@ -684,6 +684,20 @@ func machosymorder(ctxt *Link) {
}
}
// machoShouldExport reports whether a symbol needs to be exported.
//
// When dynamically linking, all non-local variables and plugin-exported
// symbols need to be exported.
func machoShouldExport(ctxt *Link, s *Symbol) bool {
if !ctxt.DynlinkingGo() || s.Attr.Local() {
return false
}
if Buildmode == BuildmodePlugin && strings.HasPrefix(s.Extname, *flagPluginPath) {
return true
}
return s.Type != obj.STEXT
}
func machosymtab(ctxt *Link) {
symtab := ctxt.Syms.Lookup(".machosymtab", 0)
symstr := ctxt.Syms.Lookup(".machosymstr", 0)
@ -692,13 +706,11 @@ func machosymtab(ctxt *Link) {
s := sortsym[i]
Adduint32(ctxt, symtab, uint32(symstr.Size))
export := machoShouldExport(ctxt, s)
// In normal buildmodes, only add _ to C symbols, as
// Go symbols have dot in the name.
//
// When dynamically linking, prefix all non-local
// symbols with _ as dlsym on darwin requires it to
// resolve any symbol.
if !strings.Contains(s.Extname, ".") || (ctxt.DynlinkingGo() && !s.Attr.Local()) {
if !strings.Contains(s.Extname, ".") || export {
Adduint8(ctxt, symstr, '_')
}
@ -711,7 +723,7 @@ func machosymtab(ctxt *Link) {
Adduint16(ctxt, symtab, 0) // desc
adduintxx(ctxt, symtab, 0, SysArch.PtrSize) // no value
} else {
if s.Attr.CgoExport() || (ctxt.DynlinkingGo() && !s.Attr.Local()) {
if s.Attr.CgoExport() || export {
Adduint8(ctxt, symtab, 0x0f)
} else {
Adduint8(ctxt, symtab, 0x0e)