Skip to content

[High] patch edk2 for CVE-2025-2296#15339

Merged
jslobodzian merged 3 commits intomicrosoft:fasttrack/3.0from
jykanase:topic_edk2-3.0-cve
Dec 22, 2025
Merged

[High] patch edk2 for CVE-2025-2296#15339
jslobodzian merged 3 commits intomicrosoft:fasttrack/3.0from
jykanase:topic_edk2-3.0-cve

Conversation

@jykanase
Copy link
Contributor

@jykanase jykanase commented Dec 18, 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

patch edk2 for CVE-2025-2296
Backported patch: yes
Astrolabe reference: https://patch-diff.githubusercontent.com/raw/tianocore/edk2/pull/10628.patch

Change Log
Does this affect the toolchain?

NO

Associated issues
  • #xxxx
Links to CVEs
Test Methodology
  • Pipeline build id: xxxx
  • local build
Screenshot 2025-12-18 121944

@jykanase jykanase requested a review from a team as a code owner December 18, 2025 06:53
@microsoft-github-policy-service microsoft-github-policy-service bot added Packaging fasttrack/3.0 PRs Destined for Azure Linux 3.0 labels Dec 18, 2025
@Kanishk-Bansal
Copy link
Contributor

Buddy Build

@Kanishk-Bansal
Copy link
Contributor

/azurepipelines run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Contributor

@Kanishk-Bansal Kanishk-Bansal left a comment

Choose a reason for hiding this comment

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

LGTM, same changes made in 2.0 as well.

@Kanishk-Bansal Kanishk-Bansal added the CVEFixReadyForMaintainerReview When a CVE fix has been reviewed by release manager and is ready for stable maintainer review label Dec 19, 2025
@Kanishk-Bansal
Copy link
Contributor

/azurepipelines run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@jslobodzian jslobodzian merged commit 11f28f1 into microsoft:fasttrack/3.0 Dec 22, 2025
16 checks passed
CBL-Mariner-Bot pushed a commit that referenced this pull request Dec 22, 2025
Co-authored-by: jslobodzian <joslobo@microsoft.com>
(cherry picked from commit 11f28f1)
@CBL-Mariner-Bot
Copy link
Collaborator

Kanishk-Bansal added a commit to azurelinux-security/azurelinux that referenced this pull request Jan 22, 2026
Updated changelog entry date for Jyoti Kanase's patch.
Ref microsoft#15339
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

4 participants