Skip to content

[AUTO-CHERRYPICK] [AutoPR- Security] Patch edk2 for CVE-2026-75803, CVE-2026-63076, CVE-2026-63074, CVE-2026-63072 [HIGH] - branch 3.0-dev - #18725

Merged
jslobodzian merged 4 commits into
3.0-devfrom
cblmargh/cherry-pick-pr-18638-to-3.0-dev
Sep 8, 2026
Merged

[AUTO-CHERRYPICK] [AutoPR- Security] Patch edk2 for CVE-2026-75803, CVE-2026-63076, CVE-2026-63074, CVE-2026-63072 [HIGH] - branch 3.0-dev#18725
jslobodzian merged 4 commits into
3.0-devfrom
cblmargh/cherry-pick-pr-18638-to-3.0-dev

Conversation

@azurelinux-ci-jwt-app

Copy link
Copy Markdown

This is an auto-generated pull request to cherry-pick commit fc2ef58 to 3.0-dev. Original PR: #18638
In case of no merge conflicts, the PR is merged without approval because it's an automated cherry-pick of an already approved PR.
In case of merge conflicts, an AI-based conflict resolver will attempt to resolve conflicts and might make mistakes. The reviewer must check AI's work before approving.

…-2026-63074, CVE-2026-63072 [HIGH] (#18638)

Co-authored-by: Aditya Singh <v-aditysing@microsoft.com>
(cherry picked from commit fc2ef58)
@azurelinux-ci-jwt-app azurelinux-ci-jwt-app Bot added the Auto Fast-track Cherry-pick Automatic cherry-pick from fast-track branch label Sep 7, 2026
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

@microsoft-github-policy-service microsoft-github-policy-service Bot added Packaging 3.0-dev PRs Destined for AzureLinux 3.0 labels Sep 7, 2026
@azurelinux-ci-jwt-app

Copy link
Copy Markdown
Author

All conflicts resolved.

@azurelinux-ci-jwt-app
azurelinux-ci-jwt-app Bot marked this pull request as ready for review September 7, 2026 13:23
@azurelinux-ci-jwt-app
azurelinux-ci-jwt-app Bot requested a review from a team as a code owner September 7, 2026 13:23
@azurelinux-ci-jwt-app

Copy link
Copy Markdown
Author

Auto Cherry-Pick SPEC Validation Summary

edk2-hvloader-signed SPEC summary

Source (fasttrack) Target (3.0-dev) Resolved
Version %{GITDATE}git%{GITCOMMIT} %{GITDATE}git%{GITCOMMIT} %{GITDATE}git%{GITCOMMIT}
Release 19 19 19
Patches 0 0 0
Conflict Yes

⚠️ Validation issues:

  • Version-release %{GITDATE}git%{GITCOMMIT}-19 is not higher than Source %{GITDATE}git%{GITCOMMIT}-19
  • Version-release %{GITDATE}git%{GITCOMMIT}-19 is not higher than Target %{GITDATE}git%{GITCOMMIT}-19
  • Duplicate changelog entry for 20240524git3e722403cd16-15 (appears 2 times)
  • Duplicate changelog entry for 20240524git3e722403cd16-14 (appears 2 times)
  • Changelog out of order: 20240524git3e722403cd16-14 appears before 20240524git3e722403cd16-17

edk2 SPEC summary

Source (fasttrack) Target (3.0-dev) Resolved
Version %{GITDATE}git%{GITCOMMIT} %{GITDATE}git%{GITCOMMIT} %{GITDATE}git%{GITCOMMIT}
Release 19 19 20
Patches 52 49 53
Conflict Yes

⚠️ Validation issues:

  • Duplicate changelog entry for 20240524git3e722403cd16-10 (appears 2 times)
  • Duplicate changelog entry for 20240524git3e722403cd16-9 (appears 2 times)
  • Duplicate changelog entry for 20170209git296153c5-3 (appears 2 times)
  • Duplicate changelog entry for 20170209git296153c5-2 (appears 2 times)
  • Changelog out of order: 20240524git3e722403cd16-9 appears before 20240524git3e722403cd16-17

⚠️ Manual review required — validation found issues that may need correction.

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

The auto cherry-pick AI resolver produced several defects in this PR
that would either fail CI or ship a broken package:

SPECS/edk2/edk2.spec
  - Restore two dropped comment lines above the "# verification with
    ovmf-vars-generator" line (dropped-spec-section symptom).
  - Remove a phantom duplicated -11/-10/-9 changelog block (with an
    orphan bullet) that was inserted between the -18 and -17 entries.
    The legitimate -11, -10, and -9 entries already exist further
    down the changelog.

SPECS-SIGNED/edk2-hvloader-signed/edk2-hvloader-signed.spec
  - Bump Release from 19 to 20 to lockstep with edk2.spec (fixes the
    Spec Entanglement Mismatch Check failure).
  - Add a new -20 changelog entry mirroring the edk2 bump.
  - Restore the missing body on the -18 entry.
  - Remove a misplaced duplicate -15 / -14 block sitting between -18
    and -17 (the legitimate entries at those release numbers appear
    further down).
  - Remove a duplicate orphan "Bump release for consistency" bullet.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: c3e2d86f-c397-4483-83b0-a200120fc5d5
@jslobodzian

Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
Successfully started running 1 pipeline(s).
1 pipeline(s) were filtered out due to trigger conditions.

@jslobodzian
jslobodzian merged commit b75b94d into 3.0-dev Sep 8, 2026
23 of 26 checks passed
@jslobodzian
jslobodzian deleted the cblmargh/cherry-pick-pr-18638-to-3.0-dev branch September 8, 2026 02:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3.0-dev PRs Destined for AzureLinux 3.0 Auto Fast-track Cherry-pick Automatic cherry-pick from fast-track branch Packaging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants