Skip to content

[MEDIUM] Patch cri-tools for CVE-2025-22872 #13869

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

aninda-al
Copy link
Contributor

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

Address CVE-2025-22872

Backported from upstream patch: golang/net@e1fcd82
Excluded token_test.go as this file and the test infrastructure is absent in the current version of our code.

Change Log
  • modified: SPECS/cri-tools/cri-tools.spec
  • added: SPECS/cri-tools/CVE-2025-22872.patch
Does this affect the toolchain?

NO

Associated issues
  • NA
Links to CVEs
Test Methodology
  • local build

@aninda-al aninda-al requested a review from a team as a code owner May 22, 2025 17:36
@Malateshk007 Malateshk007 requested a review from a team May 23, 2025 07:51
Copy link
Contributor

@kgodara912 kgodara912 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Buddy build. Patch matches with upstream reference except test file.

@kgodara912
Copy link
Contributor

Buddy build passes. Patch looks fine as same CVE is fixed in multiple packages. Will wait for CBL-Mariner-Container-Runtime review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
main PR Destined for main Packaging security
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants