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.

Sign up for GitHub

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

Jump to bottom

[Backport release-1.27] Bump runc to v1.1.12 #3997

Merged
merged 1 commit into from
Feb 2, 2024
Merged

[Backport release-1.27] Bump runc to v1.1.12 #3997

merged 1 commit into from
Feb 2, 2024

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Feb 1, 2024

@twz123
Bump runc to v1.1.12
f223e19 
https://github.com/opencontainers/runc/releases/tag/v1.1.12

Fixes CVE-2024-21626.

Also bump containerd's runc Go bindings on the way.

Signed-off-by: Tom Wieczorek <[email protected]>
(cherry picked from commit 8674d25)
(cherry picked from commit 9ada4f0)
(cherry picked from commit 3f1ff09)
@twz123 twz123 added security fix area/containers backport/release-1.26 PR that needs to be backported/cherrypicked to release-1.26 branch labels Feb 1, 2024
@twz123 twz123 marked this pull request as ready for review February 2, 2024 10:10
@twz123 twz123 requested a review from a team as a code owner February 2, 2024 10:10
@twz123 twz123 enabled auto-merge February 2, 2024 10:10
@twz123 twz123 merged commit 54f7ff7 into k0sproject:release-1.27 Feb 2, 2024
73 checks passed
@twz123 twz123 deleted the backport-3993-to-release-1.27 branch February 2, 2024 10:11
@k0s-bot
Copy link

k0s-bot commented Feb 2, 2024

Backport failed for release-1.26, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-1.26
git worktree add -d .worktree/backport-3997-to-release-1.26 origin/release-1.26
cd .worktree/backport-3997-to-release-1.26
git checkout -b backport-3997-to-release-1.26
ancref=$(git merge-base 28dfbb607f5f2ba439573c456cace4b3b54f61bc f223e196084acee3269dc4fddc3d32c724f9c438)
git cherry-pick -x $ancref..f223e196084acee3269dc4fddc3d32c724f9c438

@twz123 twz123 mentioned this pull request Feb 2, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jnummelin jnummelin jnummelin approved these changes

@ncopa ncopa Awaiting requested review from ncopa ncopa is a code owner automatically assigned from k0sproject/k0s-maintainers

@juanluisvaladas juanluisvaladas Awaiting requested review from juanluisvaladas juanluisvaladas is a code owner automatically assigned from k0sproject/k0s-maintainers

Assignees
No one assigned
Labels
area/containers backport/release-1.26 PR that needs to be backported/cherrypicked to release-1.26 branch security fix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@twz123 @k0s-bot @jnummelin