Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] update to go 1.16.15 to address CVE-2022-24921 #631

Merged
merged 1 commit into from
Mar 7, 2022

Conversation

thaJeztah
Copy link
Member

Addresses CVE-2022-24921

go1.16.15 (released 2022-03-03) includes a security fix to the regexp/syntax package,
as well as bug fixes to the compiler, runtime, the go command, and to the net package.
See the Go 1.16.15 milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.16.15+label%3ACherryPickApproved

full diff: golang/go@go1.16.14...go1.16.15

Addresses [CVE-2022-24921](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24921)

go1.16.15 (released 2022-03-03) includes a security fix to the regexp/syntax package,
as well as bug fixes to the compiler, runtime, the go command, and to the net package.
See the Go 1.16.15 milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.16.15+label%3ACherryPickApproved

full diff: golang/go@go1.16.14...go1.16.15

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

+ go build -o build/docker-linux-arm64 -tags ' pkcs11' -ldflags ' -w -X "github.com/docker/cli/cli/version.GitCommit=ab7cc48" -X "github.com/docker/cli/cli/version.BuildTime=2022-03-04T15:54:30Z" -X "github.com/docker/cli/cli/version.Version=0.0.0-20220304144818-ab7cc48" -X "github.com/docker/cli/cli/version.PlatformName=Docker Engine - Community"' -buildmode=pie github.com/docker/cli/cmd/docker
+ DISABLE_WARN_OUTSIDE_CONTAINER=1
+ make manpages
  scripts/docs/generate-man.sh
+ cp -r . /tmp/docker-cli-docsgen.wT3h05ub1Y/
+ cd /tmp/docker-cli-docsgen.wT3h05ub1Y
+ ./scripts/vendor init
+ go mod edit -modfile=vendor.mod -require=github.com/cpuguy83/go-md2man/v2@v2.0.1
+ cp man/tools.go .
+ ./scripts/vendor update
+ go mod tidy -modfile=vendor.mod
  go: github.com/theupdateframework/notary@v0.7.1-0.20210315103452-bf96a202a09a requires
  github.com/docker/go@v1.5.1-1.0.20160303222718-d30aec9fd63c: invalid pseudo-version: git fetch --unshallow -f origin in /go/pkg/mod/cache/vcs/48fbd2dfabec81f4c93170677bfc89087d4bec07a2d08f6ca5ce3d17962677ee: exit status 128:
  fatal: git fetch-pack: expected shallow list
  make: *** [manpages] Error 1
  error: Bad exit status from /var/tmp/rpm-tmp.E46oL1 (%build)

@thaJeztah
Copy link
Member Author

Did they break go modules (AGAIN1!) with CentOS versions of git ? 😠

@thaJeztah
Copy link
Member Author

Kicked CI again; hopefully it's just a once-off (or we may need to add workarounds again to make it work 😞)

@thaJeztah
Copy link
Member Author

I'm guessing this could be related to golang/go@02e5505 (addressing golang/go#51331), but not sure what the previous "regression" was, because so far things continued to work, and this may have actually broken something....

@thaJeztah
Copy link
Member Author

/cc @crazy-max

@thaJeztah
Copy link
Member Author

Opened #635 to fix / work around the go modules issue

@thaJeztah thaJeztah merged commit 1fb6e36 into docker:master Mar 7, 2022
@thaJeztah thaJeztah deleted the bump_go_1.16.15 branch March 7, 2022 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants