[Bug]: UnprotectUefiImageMu Does Not Clear Attributes

[os-d]

Is there an existing issue for this?

• [X] I have searched existing issues

Current Behavior

When unloading an image, UnprotectUefiImageMu calls into SetUefiMemoryAttributes with 0 for attributes. However that function gets the current attributes from the memory descriptor and ors those with the supplied attributes, which means the attributes can never be cleared. It also uses the ImageRecord->ImageSize as the range to clear, but that needs to be page aligned, as is done when the image is protected.

Expected Behavior

When unprotecting an image, the attributes should be cleared on a page aligned size.

Steps To Reproduce

Unprotect an image

Build Environment

- OS(s):
- Tool Chain(s):
- Targets Impacted:
All

Version Information

top of tree

Urgency

Medium

Are you going to fix this?

I will fix it

Do you need maintainer feedback?

No maintainer feedback needed

Anything else?

No response