Skip to content
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

[CHERRY-PICK][REBASE & FF] Revert Mu Commits In Favor of edk2 Commits #327

Merged
merged 7 commits into from
Aug 29, 2024
Merged

[CHERRY-PICK][REBASE & FF] Revert Mu Commits In Favor of edk2 Commits #327

merged 7 commits into from
Aug 29, 2024

Commits on Aug 29, 2024

  1. Revert "FmpDevicePkg: Assert on PcdFmpDeviceImageTypeIdGuid Size Mism… 

    …atch"

This reverts commit 14a359e as it has
been merged into edk2 as commit b7f963d570ec5e27bc04d546372c6fc47e4f3b17.
    @os-d
    os-d committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    a5b9fd1 View commit details
    Browse the repository at this point in the history

  2. [CHERRY-PICK] FmpDevicePkg: Assert on PcdFmpDeviceImageTypeIdGuid Siz… 

    …e Mismatch

This patch adds an assert to FmpDxe.c to catch a platform
misconfiguration of PcdFmpDeviceImageTypeIdGuid.

Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>
    @os-d
    Bret Barkelew authored and os-d committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    ac69f3c View commit details
    Browse the repository at this point in the history

  3. Revert "EmbeddedPkg: Mark DMA Memory Allocations XP By Default" 

    This reverts commit 8acf21a as it
has been merged in edk2 as commit 8984fba2f22a2cd44e1189403e3553f447b82852.
    @os-d
    os-d committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    883e9dc View commit details
    Browse the repository at this point in the history

  4. [CHERRY-PICK] EmbeddedPkg: Mark DMA Memory Allocations XP By Default 

    When allocating memory for a non-coherent DMA device, the current core
code removes the XP attribute, allowing code to execute from that
region. This is a security vulnerability and unneeded. This change
updates to mark the region as XP when allocating memory for the
non-coherent DMA device.

Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>
    @os-d
    os-d committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    2087426 View commit details
    Browse the repository at this point in the history

  5. Revert "PrmPkg: Don't Set Access Attributes of Runtime MMIO Ranges (m… 

    …icrosoft#51)"

This reverts commit f2d2b20 as it is
upstreamed in edk2 as commit a96d2a8f2dd3eb7e32b383821fe30cfd7cdb2248.
    @os-d
    os-d committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    34ab0f7 View commit details
    Browse the repository at this point in the history

  6. [CHERRY-PICK] PrmPkg: Don't Set Access Attributes of Runtime MMIO Ranges 

    Passing in access attributes to SetMemorySpaceAttributes() will cause
the existing attributes to be overwritten. The MMIO region should have
the appropriate attributes applied during memory protection
initialization and the attributes of the memory space descriptor are
inaccurate. Don't pass in any CPU arch attributes so
SetMemorySpaceAttributes() doesn't subsequently call
gCpu->SetMemoryAttributes().

Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>
    @TaylorBeebe @os-d
    TaylorBeebe authored and os-d committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    b6598e5 View commit details
    Browse the repository at this point in the history

  7. [CHERRY-PICK] EmbeddedPkg: NonCoherentDmaLib: Set EFI_MEMORY_XP Capab… 

    …ility on DMA Buffer

Commit 8984fba2f22a2cd44e1189403e3553f447b82852 added setting the
EFI_MEMORY_XP attribute on DMA buffers. However, it did not ensure
that the XP capability was set on that region.

This patch adds setting the XP capability before attempting to set
the attribute. If setting the capability fails, it defaults to the
old behavior of not setting the XP bit.

Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>
    @os-d
    Oliver Smith-Denny authored and os-d committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    264ed6d View commit details
    Browse the repository at this point in the history