diff options
| author | Cherry Mui <cherryyz@google.com> | 2022-12-21 16:35:57 -0500 |
|---|---|---|
| committer | Cherry Mui <cherryyz@google.com> | 2022-12-23 01:12:02 +0000 |
| commit | 1ba7341cb21d9edb2a04eb0b24b3af71899b35fc (patch) | |
| tree | 6c1fbc80b376f6cc220d7a7cdc2b2c70f67644de /src/cmd/link/internal | |
| parent | c61d322d5f9e3fcffa4c523892af432dca030c12 (diff) | |
| download | go-1ba7341cb21d9edb2a04eb0b24b3af71899b35fc.tar.xz | |
cmd/link, runtime: use a different section for Go libfuzzer counters
Currently in libfuzzer mode, we put our counters in section
__sancov_cntrs. When linking with C/C++ code that also has fuzzer
counters, apparently the C linker combines our counters and their
counters and registers them together. But in the Go runtime we
also have code to register our counters. So the Go counters ended
up registered twice, causing problems.
Since we already have code to register our counters, put them in
a Go-specific section so it won't be combined with the C counters.
Fixes #57449.
Change-Id: If3d41735124e7e301572d4b7aecf7d057ac134c0
Reviewed-on: https://go-review.googlesource.com/c/go/+/459055
Reviewed-by: Nicolas Hillegeer <aktau@google.com>
Reviewed-by: Than McIntosh <thanm@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Cherry Mui <cherryyz@google.com>
Diffstat (limited to 'src/cmd/link/internal')
| -rw-r--r-- | src/cmd/link/internal/ld/data.go | 12 | ||||
| -rw-r--r-- | src/cmd/link/internal/ld/elf.go | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go index faae153bab..94f8fc32d6 100644 --- a/src/cmd/link/internal/ld/data.go +++ b/src/cmd/link/internal/ld/data.go @@ -1860,9 +1860,9 @@ func (state *dodataState) allocateDataSections(ctxt *Link) { // Coverage instrumentation counters for libfuzzer. if len(state.data[sym.SLIBFUZZER_8BIT_COUNTER]) > 0 { - sect := state.allocateNamedSectionAndAssignSyms(&Segdata, "__sancov_cntrs", sym.SLIBFUZZER_8BIT_COUNTER, sym.Sxxx, 06) - ldr.SetSymSect(ldr.LookupOrCreateSym("__start___sancov_cntrs", 0), sect) - ldr.SetSymSect(ldr.LookupOrCreateSym("__stop___sancov_cntrs", 0), sect) + sect := state.allocateNamedSectionAndAssignSyms(&Segdata, ".go.fuzzcntrs", sym.SLIBFUZZER_8BIT_COUNTER, sym.Sxxx, 06) + ldr.SetSymSect(ldr.LookupOrCreateSym("runtime.__start___sancov_cntrs", 0), sect) + ldr.SetSymSect(ldr.LookupOrCreateSym("runtime.__stop___sancov_cntrs", 0), sect) ldr.SetSymSect(ldr.LookupOrCreateSym("internal/fuzz._counters", 0), sect) ldr.SetSymSect(ldr.LookupOrCreateSym("internal/fuzz._ecounters", 0), sect) } @@ -2643,7 +2643,7 @@ func (ctxt *Link) address() []*sym.Segment { bss = s case ".noptrbss": noptrbss = s - case "__sancov_cntrs": + case ".go.fuzzcntrs": fuzzCounters = s } } @@ -2764,8 +2764,8 @@ func (ctxt *Link) address() []*sym.Segment { ctxt.xdefine("runtime.end", sym.SBSS, int64(Segdata.Vaddr+Segdata.Length)) if fuzzCounters != nil { - ctxt.xdefine("__start___sancov_cntrs", sym.SLIBFUZZER_8BIT_COUNTER, int64(fuzzCounters.Vaddr)) - ctxt.xdefine("__stop___sancov_cntrs", sym.SLIBFUZZER_8BIT_COUNTER, int64(fuzzCounters.Vaddr+fuzzCounters.Length)) + ctxt.xdefine("runtime.__start___sancov_cntrs", sym.SLIBFUZZER_8BIT_COUNTER, int64(fuzzCounters.Vaddr)) + ctxt.xdefine("runtime.__stop___sancov_cntrs", sym.SLIBFUZZER_8BIT_COUNTER, int64(fuzzCounters.Vaddr+fuzzCounters.Length)) ctxt.xdefine("internal/fuzz._counters", sym.SLIBFUZZER_8BIT_COUNTER, int64(fuzzCounters.Vaddr)) ctxt.xdefine("internal/fuzz._ecounters", sym.SLIBFUZZER_8BIT_COUNTER, int64(fuzzCounters.Vaddr+fuzzCounters.Length)) } diff --git a/src/cmd/link/internal/ld/elf.go b/src/cmd/link/internal/ld/elf.go index 082adcc3c7..a1ae7eab57 100644 --- a/src/cmd/link/internal/ld/elf.go +++ b/src/cmd/link/internal/ld/elf.go @@ -1371,7 +1371,7 @@ func (ctxt *Link) doelf() { shstrtab.Addstring(".data") shstrtab.Addstring(".bss") shstrtab.Addstring(".noptrbss") - shstrtab.Addstring("__sancov_cntrs") + shstrtab.Addstring(".go.fuzzcntrs") shstrtab.Addstring(".go.buildinfo") if ctxt.IsMIPS() { shstrtab.Addstring(".MIPS.abiflags") |