From: Ian Lance Taylor <iant@golang.org>
Date: Fri, 3 Aug 2018 21:52:54 +0000 (-0700)
Subject: cmd/internal/objfile: only consider executable segments for load address
X-Git-Tag: go1.11rc1~49
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=65fa2b615b72c1fa61a718f2e3a756833f153cc3;p=gostls13.git

cmd/internal/objfile: only consider executable segments for load address

Reportedly on some new Fedora systems the linker is producing extra
load segments, basically making the dynamic section non-executable.
We were assuming that the first load segment could be used to
determine the program's load offset, but that is no longer true.
Use the first executable load segment instead.

Fixes #26369

Change-Id: I5ee31ddeef2e8caeed3112edc5149065a6448456
Reviewed-on: https://go-review.googlesource.com/127895
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/cmd/internal/objfile/elf.go b/src/cmd/internal/objfile/elf.go
index 7d5162a1e8..a48a9df5d6 100644
--- a/src/cmd/internal/objfile/elf.go
+++ b/src/cmd/internal/objfile/elf.go
@@ -114,7 +114,7 @@ func (f *elfFile) goarch() string {
 
 func (f *elfFile) loadAddress() (uint64, error) {
 	for _, p := range f.elf.Progs {
-		if p.Type == elf.PT_LOAD {
+		if p.Type == elf.PT_LOAD && p.Flags&elf.PF_X != 0 {
 			return p.Vaddr, nil
 		}
 	}