mirror of https://github.com/acidanthera/audk.git
MdeModulePkg/DxeCore: deal with allocations spanning several memmap entries
When attempting to perform page allocations using AllocateAddress, we fail to check whether the entire region is free before splitting the region. This may lead to memory being leaked further into the routine, when it turns out that one of the memory map entries intersected by the region is already occupied. In this case, prior conversions are not rolled back. For instance, starting from this situation 0x000040000000-0x00004007ffff [ConventionalMemory ] 0x000040080000-0x00004009ffff [Boot Data ] 0x0000400a0000-0x000047ffffff [ConventionalMemory ] a failed EfiLoaderData allocation @ 0x40000000 that covers the BootData region will fail, but leave the first part of the allocation converted, so we end up with 0x000040000000-0x00004007ffff [Loader Data ] 0x000040080000-0x00004009ffff [Boot Data ] 0x0000400a0000-0x000047ffffff [ConventionalMemory ] even though the AllocatePages() call returned an error. So let's check beforehand that AllocateAddress allocations are covered by a single memory map entry, so that it either succeeds or fails completely, rather than leaking allocations. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Star Zeng <star.zeng@intel.com>
This commit is contained in:
parent
01eb3f39bb
commit
3f2ae009ec
|
@ -754,6 +754,17 @@ CoreConvertPagesEx (
|
||||||
return EFI_NOT_FOUND;
|
return EFI_NOT_FOUND;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// If we are converting the type of the range from EfiConventionalMemory to
|
||||||
|
// another type, we have to ensure that the entire range is covered by a
|
||||||
|
// single entry.
|
||||||
|
//
|
||||||
|
if (ChangingType && (NewType != EfiConventionalMemory)) {
|
||||||
|
if (Entry->End < End) {
|
||||||
|
DEBUG ((DEBUG_ERROR | DEBUG_PAGE, "ConvertPages: range %lx - %lx covers multiple entries\n", Start, End));
|
||||||
|
return EFI_NOT_FOUND;
|
||||||
|
}
|
||||||
|
}
|
||||||
//
|
//
|
||||||
// Convert range to the end, or to the end of the descriptor
|
// Convert range to the end, or to the end of the descriptor
|
||||||
// if that's all we've got
|
// if that's all we've got
|
||||||
|
|
Loading…
Reference in New Issue