mirror of
https://github.com/burrowers/garble.git
synced 2025-09-27 04:05:52 +08:00
aed2fd2659
While strictly speaking it would be okay to leave Go 1.24 support in place for the time being, we are behind on a few tasks at the moment so it's best to keep the setup at master simpler for the next release. Go 1.25 already came out two weeks ago, and it seems to have been a fairly smooth release, so I don't suspect any end users will have trouble upgrading to it. Note that two changes were necessary for garble to work on Go 1.25.0. First, we stop deduplicating runtimeAndLinknamed with runtimeAndDeps. Otherwise, for GOOS=windows, internal/runtime/cgroup would be missing as it is a //go:linkname target from runtime on all platforms, but it is not transitively imported from runtime on GOOS=windows. Second, the testing/synctest package is now part of std, and it is a //go:linkname target from the testing package but not a transitive import from it. Teach appendListedPackages that, when loading all packages for a `go test` run, it should load the new testing/synctest package too. Fixes #968.
86 lines
2.4 KiB
Diff
86 lines
2.4 KiB
Diff
From 2a691e00bc659059133cd5604c7a099981cf684c Mon Sep 17 00:00:00 2001
|
|
From: pagran <pagran@protonmail.com>
|
|
Date: Mon, 9 Jan 2023 13:30:36 +0100
|
|
Subject: [PATCH 2/3] add unexported function name removing
|
|
|
|
---
|
|
cmd/link/internal/ld/pcln.go | 43 +++++++++++++++++++++++++++++++++++-
|
|
1 file changed, 42 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/cmd/link/internal/ld/pcln.go b/cmd/link/internal/ld/pcln.go
|
|
index 7bae9f18c5..b497573b15 100644
|
|
--- a/cmd/link/internal/ld/pcln.go
|
|
+++ b/cmd/link/internal/ld/pcln.go
|
|
@@ -8,6 +8,10 @@ import (
|
|
"os"
|
|
)
|
|
|
|
+import (
|
|
+ "unicode"
|
|
+)
|
|
+
|
|
import (
|
|
"cmd/internal/goobj"
|
|
"cmd/internal/objabi"
|
|
@@ -318,19 +322,56 @@ func walkFuncs(ctxt *Link, funcs []loader.Sym, f func(loader.Sym)) {
|
|
func (state *pclntab) generateFuncnametab(ctxt *Link, funcs []loader.Sym) map[loader.Sym]uint32 {
|
|
nameOffsets := make(map[loader.Sym]uint32, state.nfunc)
|
|
|
|
+ garbleTiny := os.Getenv("GARBLE_LINK_TINY") == "true"
|
|
+
|
|
// Write the null terminated strings.
|
|
writeFuncNameTab := func(ctxt *Link, s loader.Sym) {
|
|
symtab := ctxt.loader.MakeSymbolUpdater(s)
|
|
+ if garbleTiny {
|
|
+ symtab.AddStringAt(0, "")
|
|
+ }
|
|
+
|
|
for s, off := range nameOffsets {
|
|
+ if garbleTiny && off == 0 {
|
|
+ continue
|
|
+ }
|
|
symtab.AddCStringAt(int64(off), ctxt.loader.SymName(s))
|
|
}
|
|
}
|
|
|
|
// Loop through the CUs, and calculate the size needed.
|
|
var size int64
|
|
+
|
|
+ if garbleTiny {
|
|
+ size = 1 // first byte is reserved for empty string used for all non-exportable method names
|
|
+ }
|
|
+ // Kinds of SymNames found in the wild:
|
|
+ //
|
|
+ // * reflect.Value.CanAddr
|
|
+ // * reflect.(*Value).String
|
|
+ // * reflect.w6cEoKc
|
|
+ // * internal/abi.(*RegArgs).IntRegArgAddr
|
|
+ // * type:.eq.runtime.special
|
|
+ // * runtime/internal/atomic.(*Pointer[go.shape.string]).Store
|
|
+ //
|
|
+ // Checking whether the first rune after the last dot is uppercase seems enough.
|
|
+ isExported := func(name string) bool {
|
|
+ for _, r := range name[strings.LastIndexByte(name, '.')+1:] {
|
|
+ return unicode.IsUpper(r)
|
|
+ }
|
|
+ return false
|
|
+ }
|
|
+
|
|
walkFuncs(ctxt, funcs, func(s loader.Sym) {
|
|
+ name := ctxt.loader.SymName(s)
|
|
+
|
|
+ if garbleTiny && !isExported(name) {
|
|
+ nameOffsets[s] = 0 // redirect name to empty string
|
|
+ return
|
|
+ }
|
|
+
|
|
nameOffsets[s] = uint32(size)
|
|
- size += int64(len(ctxt.loader.SymName(s)) + 1) // NULL terminate
|
|
+ size += int64(len(name) + 1) // NULL terminate
|
|
})
|
|
|
|
state.funcnametab = state.addGeneratedSym(ctxt, "runtime.funcnametab", size, writeFuncNameTab)
|
|
--
|
|
2.48.1
|
|
|