Skip to content

fix: Patch CVE-2025-0622 for grub2 and increase sbat to grub,5#16171

Open
corvus-callidus wants to merge 1 commit intofasttrack/3.0from
lyrydber/grub2_cve_sbat
Open

fix: Patch CVE-2025-0622 for grub2 and increase sbat to grub,5#16171
corvus-callidus wants to merge 1 commit intofasttrack/3.0from
lyrydber/grub2_cve_sbat

Conversation

@corvus-callidus
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

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
Does this affect the toolchain?

NO

Associated issues
  • #xxxx
Links to CVEs
Test Methodology
  • Pipeline build id: 1067429
  • Manual testing with shim 15.8, upcoming shim 16.1 to verify both grub and secure boot functionality.

@microsoft-github-policy-service microsoft-github-policy-service bot added Packaging fasttrack/3.0 PRs Destined for Azure Linux 3.0 labels Mar 11, 2026
@corvus-callidus corvus-callidus marked this pull request as ready for review March 12, 2026 19:47
@corvus-callidus corvus-callidus requested a review from a team as a code owner March 12, 2026 19:47
@corvus-callidus
Copy link
Contributor Author

Regarding failing PR checks:

  • Check Disallowed Files check is failing due to thinking that grub2-efi-binary-signed.spec is a binary file. It contains no problematic content.
  • Check Package CGManifests is failing due to a known issue. Discussed offline with @christopherco and @jslobodzian.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

fasttrack/3.0 PRs Destined for Azure Linux 3.0 Packaging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant