Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ArmPkg/ArmMmuLib ARM: handle unmapped sections when updating permissions 

The ARM ArmMmuLib code currently does not take into account that
setting permissions on a region should take into account that a
region may not be mapped yet to begin with.

So when updating a section descriptor whose old value is zero,
pass in the address explicitly.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
This commit is contained in:
Ard Biesheuvel 2018-11-30 12:28:27 +01:00
parent 36a87fec68
commit aa1097921d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArmPkg/Library/ArmMmuLib/Arm/ArmMmuLibCore.c
View File

@ -695,8 +695,12 @@ UpdateSectionEntries (
} else { } else {
// still a section entry // still a section entry
// mask off appropriate fields if (CurrentDescriptor != 0) {
Descriptor = CurrentDescriptor & ~EntryMask; // mask off appropriate fields
Descriptor = CurrentDescriptor & ~EntryMask;
} else {
Descriptor = ((UINTN)FirstLevelIdx + i) << TT_DESCRIPTOR_SECTION_BASE_SHIFT;
}
// mask in new attributes and/or permissions // mask in new attributes and/or permissions
Descriptor |= EntryValue; Descriptor |= EntryValue;