Skip to content

Addressed multiple grub2 CVEs #14018

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
Open

Conversation

kgodara912
Copy link
Contributor

@kgodara912 kgodara912 commented Jun 17, 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

Addressing Grub2 multiple CVEs

Change Log
Does this affect the toolchain?

YES/NO

Associated issues
  • #xxxx
Links to CVEs
Test Methodology

@kgodara912 kgodara912 marked this pull request as ready for review June 18, 2025 15:13
@kgodara912 kgodara912 requested a review from a team as a code owner June 18, 2025 15:13
@kgodara912 kgodara912 requested a review from Copilot June 18, 2025 15:15
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR updates the grub2 package to address multiple security vulnerabilities by applying upstream patches for various CVEs and adjusting the spec files accordingly.

Reviewed Changes

Copilot reviewed 18 out of 18 changed files in this pull request and generated no comments.

File Description
SPECS/grub2/grub2.spec Release number bump and additions to the patch list for new CVEs.
SPECS/grub2/CVE-*.patch Multiple patch updates addressing individual CVEs with modifications to functions and security checks.
SPECS-SIGNED/grub2-efi-binary-signed.spec Release number bump to maintain consistency with grub2.spec.
Comments suppressed due to low confidence (2)

SPECS/grub2/CVE-2019-13627.patch:58

  • [nitpick] Consider adding a comment to explain the rationale behind comparing 'scalar' with 'ctx->p' and choosing the respective nbits calculation to improve code clarity for future maintainers.
+  if (mpi_cmp (scalar, ctx->p) >= 0)

SPECS/grub2/CVE-2025-0690.patch:46

  • Consider using a separate temporary variable instead of reusing 'i' for the arithmetic operation with grub_add to improve clarity and reduce potential hidden issues with in-place modification.
+      if (grub_add (i, 1, &i))

@kgodara912 kgodara912 requested a review from a team June 18, 2025 15:17
@kgodara912
Copy link
Contributor Author

@microsoft/cbl-mariner-bootloader, please do let me know any specific testing I need to do for grub2 package? Will a full build do the needful?

@Malateshk007 Malateshk007 requested a review from mfrw June 19, 2025 05:23
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.

1 participant