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

Fix patch logic & add patches for multiple CVEs in cri-o #11789

Open
wants to merge 1 commit into
base: fasttrack/2.0
Choose a base branch
from

Conversation

Sumynwa
Copy link
Contributor

@Sumynwa Sumynwa commented Jan 6, 2025

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

This PR introduces following changes:

Change Log
  • fix patching logic
  • re-work CVE patches with compilation errors
  • add patch files
Does this affect the toolchain?

NO

Associated issues
  • #xxxx
Links to CVEs
Test Methodology
  • Pipeline build id: Local build

This commit introduces following changes:
- fix applying patches after extracting the vendor sources
- fix cve patches for compilation errors
- add patches for CVE-2022-4318, CVE-2024-9341 & CVE-2024-45338
@Sumynwa Sumynwa added the fasttrack/2.0 PRs Destined for AzureLinux 2.0 label Jan 6, 2025
@Sumynwa Sumynwa marked this pull request as ready for review January 7, 2025 06:39
@Sumynwa Sumynwa requested a review from a team as a code owner January 7, 2025 06:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fasttrack/2.0 PRs Destined for AzureLinux 2.0 Packaging
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants