Skip to content

[release/2.2 backport] update to go1.24.13, go1.25.7#12871

Merged
mxpv merged 2 commits intocontainerd:release/2.2from
thaJeztah:release_2.2_backport_bump_go
Feb 9, 2026
Merged

[release/2.2 backport] update to go1.24.13, go1.25.7#12871
mxpv merged 2 commits intocontainerd:release/2.2from
thaJeztah:release_2.2_backport_bump_go

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@github-project-automation github-project-automation Bot moved this to Needs Triage in Pull Request Review Feb 8, 2026
@dosubot dosubot Bot added the area/toolchain Build and Release Toolchain label Feb 8, 2026
@thaJeztah thaJeztah changed the title [release/2.2 backport} update to go1.24.13, go1.25.7 [release/2.2 backport] update to go1.24.13, go1.25.7 Feb 8, 2026
@akhilerm
Copy link
Copy Markdown
Member

akhilerm commented Feb 9, 2026

The kubernetes node e2e tests should pass once #12875 is merged.

@github-project-automation github-project-automation Bot moved this from Needs Triage to Review In Progress in Pull Request Review Feb 9, 2026
akhilerm and others added 2 commits February 9, 2026 11:18
Signed-off-by: Akhil Mohan <[email protected]>
(cherry picked from commit bde3dea)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
go1.25.7 (released 2026-02-04) includes security fixes to the go command
and the crypto/tls package, as well as bug fixes to the compiler and the
crypto/x509 package. See the Go 1.25.7 milestone on our issue tracker for
details:
https://github.com/golang/go/issues?q=milestone%3AGo1.25.7+label%3ACherryPickApproved

full diff: golang/go@go1.25.6...go1.25.7

From the security mailing list:

> Hello gophers,
>
> We have just released Go versions 1.25.7 and 1.24.13, minor point releases.
>
> These releases include 2 security fixes following the security policy:
>
> - cmd/cgo: remove user-content from doc strings in cgo ASTs
>
>   A discrepancy between how Go and C/C++ comments
>   were parsed allowed for code smuggling into the
>   resulting cgo binary.
>
>   To prevent this behavior, the cgo compiler
>   will no longer parse user-provided doc
>   comments.
>
>   Thank you to RyotaK (https://ryotak.net) of
>   GMO Flatt Security Inc. for reporting this issue.
>
>   This is CVE-2025-61732 and https://go.dev/issue/76697.
>
> - crypto/tls: unexpected session resumption when using Config.GetConfigForClient
>
>   Config.GetConfigForClient is documented to use the original Config's session
>   ticket keys unless explicitly overridden. This can cause unexpected behavior if
>   the returned Config modifies authentication parameters, like ClientCAs: a
>   connection initially established with the parent (or a sibling) Config can be
>   resumed, bypassing the modified authentication requirements.
>
>   If ClientAuth is VerifyClientCertIfGiven or RequireAndVerifyClientCert (on the
>   server) or InsecureSkipVerify is false (on the client), crypto/tls now checks
>   that the root of the previously-verified chain is still in ClientCAs/RootCAs
>   when resuming a connection.
>
>   Go 1.26 Release Candidate 2, Go 1.25.6, and Go 1.24.12 had fixed a similar issue
>   related to session ticket keys being implicitly shared by Config.Clone. Since
>   this fix is broader, the Config.Clone behavior change has been reverted.
>
>   Note that VerifyPeerCertificate still behaves as documented: it does not apply
>   to resumed connections. Applications that use Config.GetConfigForClient or
>   Config.Clone and do not wish to blindly resume connections established with the
>   original Config must use VerifyConnection instead (or SetSessionTicketKeys or
>   SessionTicketsDisabled).
>
>   Thanks to Coia Prant (github.com/rbqvq) for reporting this issue.
>
>   This updates CVE-2025-68121 and Go issue https://go.dev/issue/77217.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 1551986)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@estesp estesp force-pushed the release_2.2_backport_bump_go branch from f6ba8b5 to b4240ef Compare February 9, 2026 16:18
@dmcgowan
Copy link
Copy Markdown
Member

dmcgowan commented Feb 9, 2026

Looks like actions is having issues, needs to still wait for CI even though its green

@estesp estesp marked this pull request as draft February 9, 2026 17:14
@estesp estesp marked this pull request as ready for review February 9, 2026 17:14
@dosubot dosubot Bot added the github_actions Pull requests that update GitHub Actions code label Feb 9, 2026
@estesp
Copy link
Copy Markdown
Member

estesp commented Feb 9, 2026

Looks like actions is having issues, needs to still wait for CI even though its green

Yeah, the rebase happened right during a brief GH outage and seems it never triggered the CI run. I think one of us will have to check out the PR and push to get it to trigger?

@thaJeztah
Copy link
Copy Markdown
Member Author

let's see if an old-school close and reopen works

@thaJeztah thaJeztah closed this Feb 9, 2026
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Feb 9, 2026
@thaJeztah thaJeztah reopened this Feb 9, 2026
@github-project-automation github-project-automation Bot moved this from Done to Needs Triage in Pull Request Review Feb 9, 2026
@mxpv mxpv merged commit befea1e into containerd:release/2.2 Feb 9, 2026
89 of 92 checks passed
@github-project-automation github-project-automation Bot moved this from Needs Triage to Done in Pull Request Review Feb 9, 2026
@thaJeztah thaJeztah deleted the release_2.2_backport_bump_go branch February 9, 2026 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/toolchain Build and Release Toolchain github_actions Pull requests that update GitHub Actions code size/S

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

6 participants