fix: Patch CVE-2025-0622 for grub2 and increase sbat to grub,5#16171
Merged
jslobodzian merged 1 commit intofasttrack/3.0from Mar 16, 2026
Merged
fix: Patch CVE-2025-0622 for grub2 and increase sbat to grub,5#16171jslobodzian merged 1 commit intofasttrack/3.0from
jslobodzian merged 1 commit intofasttrack/3.0from
Conversation
Contributor
Author
|
Regarding failing PR checks:
|
christopherco
approved these changes
Mar 13, 2026
4863f0a to
5cf28e4
Compare
jslobodzian
approved these changes
Mar 16, 2026
CBL-Mariner-Bot
pushed a commit
that referenced
this pull request
Mar 16, 2026
(cherry picked from commit f33bbe7)
Collaborator
|
Auto cherry-pick results:
Auto cherry-pick pipeline run -> https://dev.azure.com/mariner-org/mariner/_build/results?buildId=1070802&view=results |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge Checklist
All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)
*-staticsubpackages, etc.) have had theirReleasetag incremented../cgmanifest.json,./toolkit/scripts/toolchain/cgmanifest.json,.github/workflows/cgmanifest.json)./LICENSES-AND-NOTICES/SPECS/data/licenses.json,./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md,./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)*.signatures.jsonfilessudo make go-tidy-allandsudo make go-test-coveragepassSummary
The upstream review process for updating shim to 16.1 requires that our version of grub2 contain certain CVE fixes and be updated to sbat
grub,5. During the preparation of the review collateral, it was noticed that we were missing CVE-2025-0622 and the sbat increase. NIST has not finished its analysis of this CVE, so Astrolabe did not flag it.I have verified that all of the other CVEs fixes required for the shim review are present in our package. There should be no additional changes needed.
Change Log
grub,5Does this affect the toolchain?
NO
Associated issues
Links to CVEs
Test Methodology