Skip to content

Commit 4f74de1

Browse files
binarycrusader4ad
authored andcommitted
cmd/go: fix Go buildid reading on Solaris
TestNoteReading fails on Solaris with linkmode=external due to some assumptions made about how ELF .note sections are written by some linkers. On current versions of Solaris and older derivatives, SHF_ALLOC is intentionally ignored for .note sections unless the .note section is assigned to the text segment via a mapfile. Also, if .note sections are assigned to the text segment, no PT_NOTE program header will be created thwarting Go's attempts at attempting to quickly find the .note. Furthermore, Go assumes that the relevant note segment will be placed early in the file while the Solaris linker currently places the note segment last in the file, additionally thwarting Go's optimisation attempts that read only the first 16KB of the file to find the buildid. The fix is to detect when the note section is outside of the first 16KB of the file and then fallback to additionally reading that section of the file. This way, in future versions of Solaris when this linking behaviour is changed, the fast path will always succeed and we'll only be slower if it fails; likewise, any other linker that does this will also just work. Fixes #12178 Change-Id: I61c1dc3f744ae3ad63938386d2ace8a432c0efe1 Reviewed-on: https://go-review.googlesource.com/14210 Run-TryBot: Aram Hăvărneanu <[email protected]> Reviewed-by: Aram Hăvărneanu <[email protected]>
1 parent e49b246 commit 4f74de1

File tree

3 files changed

+26
-13
lines changed

3 files changed

+26
-13
lines changed

src/cmd/go/note.go

+26-6
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ func readELFNote(filename, name string, typ int32) ([]byte, error) {
6969

7070
var elfGoNote = []byte("Go\x00\x00")
7171

72-
// readELFGoBuildID the Go build ID string from an ELF binary.
73-
// The Go build ID is stored in a note described by an ELF PT_NOTE prog header.
74-
// The caller has already opened filename, to get f, and read the first 4 kB out, in data.
72+
// The Go build ID is stored in a note described by an ELF PT_NOTE prog
73+
// header. The caller has already opened filename, to get f, and read
74+
// at least 4 kB out, in data.
7575
func readELFGoBuildID(filename string, f *os.File, data []byte) (buildid string, err error) {
76-
// Assume the note content is in the first 4 kB, already read.
76+
// Assume the note content is in the data, already read.
7777
// Rewrite the ELF header to set shnum to 0, so that we can pass
7878
// the data to elf.NewFile and it will decode the Prog list but not
7979
// try to read the section headers and the string table from disk.
@@ -95,11 +95,31 @@ func readELFGoBuildID(filename string, f *os.File, data []byte) (buildid string,
9595
return "", &os.PathError{Path: filename, Op: "parse", Err: err}
9696
}
9797
for _, p := range ef.Progs {
98-
if p.Type != elf.PT_NOTE || p.Off >= uint64(len(data)) || p.Off+p.Filesz >= uint64(len(data)) || p.Filesz < 16 {
98+
if p.Type != elf.PT_NOTE || p.Filesz < 16 {
9999
continue
100100
}
101101

102-
note := data[p.Off : p.Off+p.Filesz]
102+
var note []byte
103+
if p.Off+p.Filesz < uint64(len(data)) {
104+
note = data[p.Off : p.Off+p.Filesz]
105+
} else {
106+
// For some linkers, such as the Solaris linker,
107+
// the buildid may not be found in data (which
108+
// likely contains the first 16kB of the file)
109+
// or even the first few megabytes of the file
110+
// due to differences in note segment placement;
111+
// in that case, extract the note data manually.
112+
_, err = f.Seek(int64(p.Off), 0)
113+
if err != nil {
114+
return "", err
115+
}
116+
117+
note = make([]byte, p.Filesz)
118+
_, err = io.ReadFull(f, note)
119+
if err != nil {
120+
return "", err
121+
}
122+
}
103123
nameSize := ef.ByteOrder.Uint32(note)
104124
valSize := ef.ByteOrder.Uint32(note[4:])
105125
tag := ef.ByteOrder.Uint32(note[8:])

src/cmd/go/note_test.go

-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ func TestNoteReading(t *testing.T) {
3333
// no external linking
3434
t.Logf("no external linking - skipping linkmode=external test")
3535

36-
case "solaris":
37-
t.Logf("skipping - golang.org/issue/12178")
38-
3936
default:
4037
tg.run("build", "-ldflags", "-buildid="+buildID+" -linkmode=external", "-o", tg.path("hello.exe"), tg.path("hello.go"))
4138
id, err := main.ReadBuildIDFromBinary(tg.path("hello.exe"))

src/cmd/link/internal/ld/elf.go

-4
Original file line numberDiff line numberDiff line change
@@ -1725,10 +1725,6 @@ func doelf() {
17251725
Addstring(shstrtab, ".note.go.pkg-list")
17261726
Addstring(shstrtab, ".note.go.deps")
17271727
}
1728-
1729-
if buildid != "" {
1730-
Addstring(shstrtab, ".note.go.buildid")
1731-
}
17321728
}
17331729

17341730
hasinitarr := Linkshared

0 commit comments

Comments
 (0)