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

[release-1.28] Build containerd using runc v1.1.12 #3995

Merged
merged 1 commit into from
Feb 1, 2024

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Feb 1, 2024

Description

Fixes CVE-2024-21626 for the bundled containerd binaries.

K0s cannot use any containerd release past v1.7.8 due to dependency conflicts. Hence ensure that the binary is built linking against a non-vulnerable version of runc at least.

See:

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

Fixes CVE-2024-21626 for the bundled containerd binaries.

K0s cannot use any containerd release past v1.7.8 due to dependency
conflicts. Hence ensure that the binary is built linking against a
non-vulnerable version of runc at least.

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
@twz123 twz123 added security fix area/containers component/containerd backport/release-1.27 PR that needs to be backported/cherrypicked to release-1.27 branch labels Feb 1, 2024
@twz123 twz123 marked this pull request as ready for review February 1, 2024 14:08
@twz123 twz123 requested a review from a team as a code owner February 1, 2024 14:08
@twz123 twz123 merged commit 710040e into k0sproject:release-1.28 Feb 1, 2024
75 checks passed
@twz123 twz123 deleted the containerd-custom-runc branch February 1, 2024 14:08
@k0s-bot
Copy link

k0s-bot commented Feb 1, 2024

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

Please cherry-pick the changes locally.

git fetch origin release-1.27
git worktree add -d .worktree/backport-3995-to-release-1.27 origin/release-1.27
cd .worktree/backport-3995-to-release-1.27
git checkout -b backport-3995-to-release-1.27
ancref=$(git merge-base 8d446375c2a344ca8ee85b601d02868d7629f65e eb90ee98283799e4dd423bde8c7992e733db95e1)
git cherry-pick -x $ancref..eb90ee98283799e4dd423bde8c7992e733db95e1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/containers backport/release-1.27 PR that needs to be backported/cherrypicked to release-1.27 branch component/containerd security fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants