update golang to 1.18.3, 1.17.11

go1.18.3 (released 2022-06-01) includes security fixes to the crypto/rand,
crypto/tls, os/exec, and path/filepath packages, as well as bug fixes to the
compiler, and the crypto/tls and text/template/parse packages. See the Go
1.18.3 milestone on our issue tracker for details:

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

update golang to 1.17.11

go1.17.11 (released 2022-06-01) includes security fixes to the crypto/rand,
crypto/tls, os/exec, and path/filepath packages, as well as bug fixes to the
crypto/tls package. See the Go 1.17.11 milestone on our issue tracker for details.

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

Hello gophers,

We have just released Go versions 1.18.3 and 1.17.11, minor point releases.

These minor releases include 4 security fixes following the security policy:

- crypto/rand: rand.Read hangs with extremely large buffers
  On Windows, rand.Read will hang indefinitely if passed a buffer larger than
  1 << 32 - 1 bytes.

  Thanks to Davis Goodin and Quim Muntal, working at Microsoft on the Go toolset,
  for reporting this issue.

  This is [CVE-2022-30634][CVE-2022-30634] and Go issue https://go.dev/issue/52561.
- crypto/tls: session tickets lack random ticket_age_add
  Session tickets generated by crypto/tls did not contain a randomly generated
  ticket_age_add. This allows an attacker that can observe TLS handshakes to
  correlate successive connections by comparing ticket ages during session
  resumption.

  Thanks to GitHub user nervuri for reporting this.

  This is [CVE-2022-30629][CVE-2022-30629] and Go issue https://go.dev/issue/52814.
- `os/exec`: empty `Cmd.Path` can result in running unintended binary on Windows

  If, on Windows, `Cmd.Run`, `cmd.Start`, `cmd.Output`, or `cmd.CombinedOutput`
  are executed when Cmd.Path is unset and, in the working directory, there are
  binaries named either "..com" or "..exe", they will be executed.

  Thanks to Chris Darroch, brian m. carlson, and Mikhail Shcherbakov for reporting
  this.

  This is [CVE-2022-30580][CVE-2022-30580] and Go issue https://go.dev/issue/52574.
- `path/filepath`: Clean(`.\c:`) returns `c:` on Windows

  On Windows, the `filepath.Clean` function could convert an invalid path to a
  valid, absolute path. For example, Clean(`.\c:`) returned `c:`.

  Thanks to Unrud for reporting this issue.

  This is [CVE-2022-29804][CVE-2022-29804] and Go issue https://go.dev/issue/52476.

[CVE-2022-30634]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-30634
[CVE-2022-30629]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-30629
[CVE-2022-30580]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-30580
[CVE-2022-29804]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-29804

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-06-02 09:45:19 +02:00
parent 5e876262ed
commit 1b3c3860db
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
12 changed files with 23 additions and 23 deletions

View File

@ -39,7 +39,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.2' go-version: '1.18.3'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

View File

@ -20,7 +20,7 @@ jobs:
strategy: strategy:
matrix: matrix:
go-version: [1.18.2] go-version: [1.18.3]
os: [ubuntu-18.04, macos-10.15, windows-2019] os: [ubuntu-18.04, macos-10.15, windows-2019]
steps: steps:
@ -46,7 +46,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.2' go-version: '1.18.3'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@ -78,7 +78,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.2' go-version: '1.18.3'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@ -110,7 +110,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.2' go-version: '1.18.3'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1 - run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1
- run: make man - run: make man
@ -148,7 +148,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.2' go-version: '1.18.3'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: | - run: |
set -e -x set -e -x
@ -215,7 +215,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-18.04, macos-10.15, windows-2019, windows-2022] os: [ubuntu-18.04, macos-10.15, windows-2019, windows-2022]
go-version: ['1.17.10', '1.18.2'] go-version: ['1.17.11', '1.18.3']
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
@ -261,7 +261,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.2' go-version: '1.18.3'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@ -389,7 +389,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.2' go-version: '1.18.3'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -508,7 +508,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.2' go-version: '1.18.3'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: sudo -E PATH=$PATH script/setup/install-gotestsum - run: sudo -E PATH=$PATH script/setup/install-gotestsum
- name: Tests - name: Tests

View File

@ -26,7 +26,7 @@ jobs:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: 1.18.2 go-version: 1.18.3
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL

View File

@ -24,7 +24,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.2' go-version: '1.18.3'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

View File

@ -18,7 +18,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.2' go-version: '1.18.3'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
@ -155,7 +155,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.18.2' go-version: '1.18.3'
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:

View File

@ -66,7 +66,7 @@ jobs:
- name: Install Go - name: Install Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: '1.18.2' go-version: '1.18.3'
- name: Set env - name: Set env
shell: bash shell: bash
env: env:
@ -109,7 +109,7 @@ jobs:
find ./releases/ -maxdepth 1 -type l | xargs rm find ./releases/ -maxdepth 1 -type l | xargs rm
working-directory: src/github.com/containerd/containerd working-directory: src/github.com/containerd/containerd
env: env:
GO_VERSION: '1.18.2' GO_VERSION: '1.18.3'
PLATFORM: ${{ matrix.platform }} PLATFORM: ${{ matrix.platform }}
- name: Save Artifacts - name: Save Artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2

View File

@ -2,7 +2,7 @@
become: yes become: yes
roles: roles:
- role: config-golang - role: config-golang
go_version: '1.18.2' go_version: '1.18.3'
arch: arm64 arch: arm64
tasks: tasks:
- name: Install pre-requisites - name: Install pre-requisites

View File

@ -2,7 +2,7 @@
become: yes become: yes
roles: roles:
- role: config-golang - role: config-golang
go_version: '1.18.2' go_version: '1.18.3'
arch: arm64 arch: arm64
tasks: tasks:
- name: Build containerd - name: Build containerd

View File

@ -2,7 +2,7 @@
become: yes become: yes
roles: roles:
- role: config-golang - role: config-golang
go_version: '1.18.2' go_version: '1.18.3'
arch: arm64 arch: arm64
tasks: tasks:
- name: Build and test containerd - name: Build and test containerd

2
Vagrantfile vendored
View File

@ -97,7 +97,7 @@ EOF
config.vm.provision "install-golang", type: "shell", run: "once" do |sh| config.vm.provision "install-golang", type: "shell", run: "once" do |sh|
sh.upload_path = "/tmp/vagrant-install-golang" sh.upload_path = "/tmp/vagrant-install-golang"
sh.env = { sh.env = {
'GO_VERSION': ENV['GO_VERSION'] || "1.18.2", 'GO_VERSION': ENV['GO_VERSION'] || "1.18.3",
} }
sh.inline = <<~SHELL sh.inline = <<~SHELL
#!/usr/bin/env bash #!/usr/bin/env bash

View File

@ -10,7 +10,7 @@
# #
# docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../ # docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../
ARG GOLANG_VERSION=1.18.2 ARG GOLANG_VERSION=1.18.3
ARG GOLANG_IMAGE=golang ARG GOLANG_IMAGE=golang
FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang

View File

@ -20,11 +20,11 @@ set -x
apt-get update && apt-get install -y wget apt-get update && apt-get install -y wget
cd $SRC cd $SRC
wget https://go.dev/dl/go1.18.2.linux-amd64.tar.gz wget https://go.dev/dl/go1.18.3.linux-amd64.tar.gz
mkdir temp-go mkdir temp-go
rm -rf /root/.go/* rm -rf /root/.go/*
tar -C temp-go/ -xzf go1.18.2.linux-amd64.tar.gz tar -C temp-go/ -xzf go1.18.3.linux-amd64.tar.gz
mv temp-go/go/* /root/.go/ mv temp-go/go/* /root/.go/
cd $SRC/containerd cd $SRC/containerd