]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/go: omit build metadata that may contain system paths when -trimpath is set
authorBryan C. Mills <bcmills@google.com>
Fri, 27 May 2022 19:54:44 +0000 (15:54 -0400)
committerGopher Robot <gobot@golang.org>
Tue, 28 Jun 2022 16:04:54 +0000 (16:04 +0000)
CGO flag variables often include system paths for header files and
compiled libraries. The point of -trimpath is to avoid dependending on
system paths, so stamping these variables is counterproductive.

Moreover, the point of stamping build information is to improve
reproducibility. Since we don't also stamp the versions of C
compilers, headers, and libraries used in a cgo build, only the most
trivial cgo programs can be faithfully reproduced from the stamped
information.

Likewise, the -ldflags flag may include system-specific paths,
particularly if external linking is in use. For now, we omit -ldflags
entirely; however, in the future we may instead want to parse and
redact the individual flags.

Fixes #52372.

Change-Id: I73318a01cce4371d66955b3261fc7ee58d4b33dd
Reviewed-on: https://go-review.googlesource.com/c/go/+/409174
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Bryan Mills <bcmills@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Bryan Mills <bcmills@google.com>

src/cmd/go/internal/load/pkg.go
src/cmd/go/testdata/script/version_build_settings.txt

index 95a06a325d370a53cd4d5aaad36410ab709c87c3..fcb72b07b2a6b36c0b06f7983b9feca96aafcabe 100644 (file)
@@ -2347,7 +2347,17 @@ func (p *Package) setBuildInfo(includeVCS bool) {
                appendSetting("-gcflags", gcflags)
        }
        if ldflags := BuildLdflags.String(); ldflags != "" {
-               appendSetting("-ldflags", ldflags)
+               // https://go.dev/issue/52372: only include ldflags if -trimpath is not set,
+               // since it can include system paths through various linker flags (notably
+               // -extar, -extld, and -extldflags).
+               //
+               // TODO: since we control cmd/link, in theory we can parse ldflags to
+               // determine whether they may refer to system paths. If we do that, we can
+               // redact only those paths from the recorded -ldflags setting and still
+               // record the system-independent parts of the flags.
+               if !cfg.BuildTrimpath {
+                       appendSetting("-ldflags", ldflags)
+               }
        }
        if cfg.BuildMSan {
                appendSetting("-msan", "true")
@@ -2366,7 +2376,14 @@ func (p *Package) setBuildInfo(includeVCS bool) {
                cgo = "1"
        }
        appendSetting("CGO_ENABLED", cgo)
-       if cfg.BuildContext.CgoEnabled {
+       // https://go.dev/issue/52372: only include CGO flags if -trimpath is not set.
+       // (If -trimpath is set, it is possible that these flags include system paths.)
+       // If cgo is involved, reproducibility is already pretty well ruined anyway,
+       // given that we aren't stamping header or library versions.
+       //
+       // TODO(bcmills): perhaps we could at least parse the flags and stamp the
+       // subset of flags that are known not to be paths?
+       if cfg.BuildContext.CgoEnabled && !cfg.BuildTrimpath {
                for _, name := range []string{"CGO_CFLAGS", "CGO_CPPFLAGS", "CGO_CXXFLAGS", "CGO_LDFLAGS"} {
                        appendSetting(name, cfg.Getenv(name))
                }
index 90c72537648702855c65e5da706cce50c09dea4f..bfa7f5fbbe6d100da0377fec51a06f21545e87e0 100644 (file)
@@ -51,19 +51,34 @@ go build
 go version -m m$GOEXE
 stdout '^\tbuild\tCGO_ENABLED=0$'
 ! stdout CGO_CPPFLAGS|CGO_CFLAGS|CGO_CXXFLAGS|CGO_LDFLAGS
+
 [cgo] env CGO_ENABLED=1
 [cgo] env CGO_CPPFLAGS=-DFROM_CPPFLAGS=1
 [cgo] env CGO_CFLAGS=-DFROM_CFLAGS=1
 [cgo] env CGO_CXXFLAGS=-DFROM_CXXFLAGS=1
 [cgo] env CGO_LDFLAGS=-L/extra/dir/does/not/exist
-[cgo] go build
+[cgo] go build '-ldflags=all=-linkmode=external -extldflags=-L/bonus/dir/does/not/exist'
 [cgo] go version -m m$GOEXE
+[cgo] stdout '^\tbuild\t-ldflags="all=-linkmode=external -extldflags=-L/bonus/dir/does/not/exist"$'
 [cgo] stdout '^\tbuild\tCGO_ENABLED=1$'
 [cgo] stdout '^\tbuild\tCGO_CPPFLAGS=-DFROM_CPPFLAGS=1$'
 [cgo] stdout '^\tbuild\tCGO_CFLAGS=-DFROM_CFLAGS=1$'
 [cgo] stdout '^\tbuild\tCGO_CXXFLAGS=-DFROM_CXXFLAGS=1$'
 [cgo] stdout '^\tbuild\tCGO_LDFLAGS=-L/extra/dir/does/not/exist$'
 
+# https://go.dev/issue/52372: a cgo-enabled binary should not be stamped with
+# CGO_ flags that contain paths.
+[cgo] env CGO_ENABLED=1
+[cgo] env CGO_CPPFLAGS=-DFROM_CPPFLAGS=1
+[cgo] env CGO_CFLAGS=-DFROM_CFLAGS=1
+[cgo] env CGO_CXXFLAGS=-DFROM_CXXFLAGS=1
+[cgo] env CGO_LDFLAGS=-L/extra/dir/does/not/exist
+[cgo] go build -trimpath '-ldflags=all=-linkmode=external -extldflags=-L/bonus/dir/does/not/exist'
+[cgo] go version -m m$GOEXE
+[cgo] ! stdout '/extra/dir/does/not/exist'
+[cgo] ! stdout '/bonus/dir/does/not/exist'
+[cgo] stdout '^\tbuild\tCGO_ENABLED=1$'
+
 -- go.mod --
 module example.com/m