Skip to content

[High] patch grub2 for CVE-2025-0624 #13939

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Jun 13, 2025
Merged

[High] patch grub2 for CVE-2025-0624 #13939

merged 4 commits into from
Jun 13, 2025

Conversation

jykanase
Copy link
Contributor

@jykanase jykanase commented Jun 2, 2025 •
edited
Loading

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

patch grub2 for CVE-2025-0624

Explaination

The changes in https://lists.gnu.org/archive/html/grub-devel/2025-02/msg00027.html are applied to source, as it has definition for strlcpy function which is needed for the https://lists.gnu.org/archive/html/grub-devel/2025-02/msg00052.html to work properly.

Change Log
  • grub2.spec
Does this affect the toolchain?

NO

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

@jykanase jykanase requested a review from a team as a code owner June 2, 2025 12:00
@microsoft-github-policy-service microsoft-github-policy-service bot added Packaging fasttrack/3.0 PRs Destined for Azure Linux 3.0 labels Jun 2, 2025
@Kanishk-Bansal Kanishk-Bansal requested a review from a team June 2, 2025 12:10
@Kanishk-Bansal
Copy link
Contributor

/azurepipelines run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Kanishk-Bansal
Copy link
Contributor

Please mention the upstream reference of diff in include/grub/misc.h

@jykanase
Copy link
Contributor Author

jykanase commented Jun 2, 2025

Please mention the upstream reference of diff in include/grub/misc.h

https://lists.gnu.org/archive/html/grub-devel/2025-02/msg00027.html

@Kanishk-Bansal
Copy link
Contributor

/azurepipelines run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Camelron
Camelron reviewed Jun 2, 2025
View reviewed changes
@PawelWMS
Copy link
Contributor

PawelWMS commented Jun 2, 2025

Please mention the upstream reference of diff in include/grub/misc.h

https://lists.gnu.org/archive/html/grub-devel/2025-02/msg00027.html

Please also add an explanation why it was added to make it easier to understand the PR. Ideally, please summarize your changes and logic in the PR's summary.

@PawelWMS
Copy link
Contributor

PawelWMS commented Jun 2, 2025

Patch itself looks good, left an ask for a PR clean-up.

@PawelWMS
Copy link
Contributor

PawelWMS commented Jun 2, 2025

Verified failing PR check - failed due to infrastructure issues. Package build and tests, however, are green.

@azure-pipelines Azure Pipelines
Copy link

There was an error handling pipeline event c83c934c-59f0-44a4-bc95-18adfdb39975.

@jykanase
Copy link
Contributor Author

jykanase commented Jun 3, 2025

Patch itself looks good, left an ask for a PR clean-up.

Added the explanation in the summary

@Kanishk-Bansal
Copy link
Contributor

/azurepipelines run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

PawelWMS
PawelWMS reviewed Jun 3, 2025
View reviewed changes
@PawelWMS PawelWMS added the CVEFixReadyForMaintainerReview When a CVE fix has been reviewed by release manager and is ready for stable maintainer review label Jun 3, 2025
@PawelWMS
Copy link
Contributor

PawelWMS commented Jun 3, 2025

/azurepipelines run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Kanishk-Bansal
Copy link
Contributor

/azurepipelines run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@jslobodzian jslobodzian requested a review from a team June 9, 2025 18:56
@mbykhovtsev-ms
Copy link
Contributor

/azurepipelines run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Kanishk-Bansal
Copy link
Contributor

/azurepipelines run

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Kanishk-Bansal
Copy link
Contributor

re running the arm tests which didn't run due to infra issues

@jslobodzian jslobodzian merged commit ca3fbc6 into microsoft:fasttrack/3.0 Jun 13, 2025
22 of 27 checks passed
CBL-Mariner-Bot pushed a commit that referenced this pull request Jun 13, 2025
@jykanase @Kanishk-Bansal
@mbykhovtsev-ms @CBL-Mariner-Bot
[High] patch grub2 for CVE-2025-0624 (#13939)
00fc6b7 
Co-authored-by: Kanishk Bansal <103916909+Kanishk-Bansal@users.noreply.github.com>
Co-authored-by: Mykhailo Bykhovtsev <108374904+mbykhovtsev-ms@users.noreply.github.com>
(cherry picked from commit ca3fbc6)
@CBL-Mariner-Bot CBL-Mariner-Bot mentioned this pull request Jun 13, 2025
Merged
@CBL-Mariner-Bot
Copy link
Collaborator

Auto cherry-pick results:

Auto cherry-pick pipeline run -> https://dev.azure.com/mariner-org/mariner/_build/results?buildId=835705&view=results

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

@PawelWMS PawelWMS PawelWMS approved these changes

@Camelron Camelron Camelron approved these changes

@mbykhovtsev-ms mbykhovtsev-ms mbykhovtsev-ms approved these changes

Assignees
No one assigned
Labels
CVEFixReadyForMaintainerReview When a CVE fix has been reviewed by release manager and is ready for stable maintainer review fasttrack/3.0 PRs Destined for Azure Linux 3.0 Packaging security
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@jykanase @Kanishk-Bansal @PawelWMS @mbykhovtsev-ms @CBL-Mariner-Bot @Camelron @jslobodzian