Skip to content

[Medium] Patched edk2 CVE-2024-38796, CVE-2024-6129, CVE-2024-2511, and CVE-2024-4603. #13266

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
Closed
jykanase wants to merge 6 commits into from
Closed

[Medium] Patched edk2 CVE-2024-38796, CVE-2024-6129, CVE-2024-2511, and CVE-2024-4603. #13266

jykanase wants to merge 6 commits into from

Conversation

@jykanase
Copy link
Contributor

@jykanase jykanase commented Apr 3, 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 edk2 for CVE-2024-38796

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

YES/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 April 3, 2025 09:18
@microsoft-github-policy-service microsoft-github-policy-service bot added Packaging fasttrack/3.0 PRs Destined for Azure Linux 3.0 labels Apr 3, 2025
@Kanishk-Bansal
Copy link
Contributor

Kanishk-Bansal commented Apr 7, 2025

/azurepipelines run

@azure-pipelines
Copy link

azure-pipelines bot commented Apr 7, 2025

Azure Pipelines successfully started running 1 pipeline(s).

kgodara912
kgodara912 reviewed Apr 13, 2025
View reviewed changes
SPECS/edk2/edk2.spec Outdated
Release: 6%{?dist}
Summary: UEFI firmware for 64-bit virtual machines
License: Apache-2.0 AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-2-Clause-Patent AND BSD-3-Clause AND BSD-4-Clause AND ISC AND MIT AND LicenseRef-Fedora-Public-Domain
URL: http://www.tianocore.org
Copy link
Contributor

@kgodara912 kgodara912 Apr 13, 2025

Choose a reason for hiding this comment

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

If possible, please change the url to https.

SPECS/edk2/edk2.spec Outdated
Patch1000: CVE-2022-3996.patch
Patch1001: CVE-2024-6119.patch
Patch1002: vendored-openssl-1.1.1-Only-free-the-read-buffers-if-we-re-not-using-them.patch
Patch1003: CVE-2024-38796.patch
Copy link
Contributor

@kgodara912 kgodara912 Apr 13, 2025

Choose a reason for hiding this comment

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

Please check if patches >= 1000 are conventionally put for openssl while patches below < 1000 are for regular edk2.

@jykanase jykanase force-pushed the topic_edk2-3.0 branch 2 times, most recently from 2d09806 to aad1224 Compare April 14, 2025 05:28
kgodara912
kgodara912 reviewed Apr 14, 2025
View reviewed changes
Copy link
Contributor

@kgodara912 kgodara912 left a comment

Choose a reason for hiding this comment

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

Good for next stage: buddy build pipeline.

@jslobodzian jslobodzian requested a review from a team April 15, 2025 19:30
@jykanase jykanase force-pushed the topic_edk2-3.0 branch 2 times, most recently from 4ced9bd to 274f44f Compare April 22, 2025 03:55
@Kanishk-Bansal
Copy link
Contributor

Kanishk-Bansal commented Apr 22, 2025

/azurepipelines run

@azure-pipelines
Copy link

azure-pipelines bot commented Apr 22, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@Camelron Camelron mentioned this pull request Apr 22, 2025
Closed
12 tasks
@Camelron
Copy link
Contributor

Camelron commented Apr 22, 2025

Could possible build/test this change on top of #12657

@arc9693
Copy link
Contributor

arc9693 commented Apr 23, 2025

Could possible build/test this change on top of #12657

+1

arc9693
arc9693 reviewed Apr 23, 2025
View reviewed changes
Copy link
Contributor

@arc9693 arc9693 left a comment

Choose a reason for hiding this comment

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

LGTM. Except that you might want to top this over the PR Cameron mentioned as it conflicts with it: #12657

@Kanishk-Bansal
Copy link
Contributor

Kanishk-Bansal commented May 5, 2025

/azurepipelines run

@azure-pipelines
Copy link

azure-pipelines bot commented May 5, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@PawelWMS PawelWMS changed the title [Medium] patch edk2 for CVE-2024-38796 [Medium] patch edk2 for CVE-2024-38796, CVE-2024-6129, CVE-2024-2511, and CVE-2024-4603 May 5, 2025
@PawelWMS PawelWMS changed the title [Medium] patch edk2 for CVE-2024-38796, CVE-2024-6129, CVE-2024-2511, and CVE-2024-4603 [Medium] Patched edk2 CVE-2024-38796, CVE-2024-6129, CVE-2024-2511, and CVE-2024-4603. May 5, 2025
PawelWMS
PawelWMS approved these changes May 5, 2025
View reviewed changes
Copy link
Contributor

@PawelWMS PawelWMS left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Waiting for a manually-ran PR check to finish: https://dev.azure.com/mariner-org/mariner/_build/results?buildId=803636&view=results.

@PawelWMS PawelWMS added the CVEFixReadyForMaintainerReview When a CVE fix has been reviewed by release manager and is ready for stable maintainer review label May 5, 2025
jslobodzian
jslobodzian reviewed May 5, 2025
View reviewed changes
SPECS/edk2/edk2.spec
Patch1002: CVE-2024-4741.patch
Patch1003: CVE-2024-13176.patch
Patch1004: CVE-2024-2511.patch
Patch1005: CVE-2023-6129.patch
Copy link
Collaborator

@jslobodzian jslobodzian May 5, 2025

Choose a reason for hiding this comment

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

@jykanase We should not take this 2023-6129 patch. It applies to powerpc.

jslobodzian
jslobodzian requested changes May 5, 2025
View reviewed changes
Copy link
Collaborator

@jslobodzian jslobodzian left a comment

Choose a reason for hiding this comment

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

Remove the PowerPC CVE fix and dispute it as N/A

@PawelWMS
Copy link
Contributor

PawelWMS commented May 8, 2025

PR moved to the dev branch in #13715.

@PawelWMS PawelWMS closed this May 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kgodara912 kgodara912 kgodara912 left review comments

@jslobodzian jslobodzian jslobodzian requested changes

@PawelWMS PawelWMS PawelWMS approved these changes

+1 more reviewer

@arc9693 arc9693 arc9693 left review comments

Reviewers whose approvals may not affect merge requirements

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@jykanase @Kanishk-Bansal @Camelron @arc9693 @PawelWMS @jslobodzian @kgodara912