Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2025-02-02 22:51:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix memory allocation for legacy Clover

Browse Source 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
This commit is contained in:
Sergey Isakov 2019-09-14 19:30:51 +03:00
parent ecab494bd2
commit f76a8c3019
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
MdePkg/Library/UefiMemoryAllocationLib/MemoryAllocationLib.c
View File

@ -139,13 +139,17 @@ FreePages (
IN UINTN Pages IN UINTN Pages
) )
{ {
// EFI_STATUS Status; EFI_STATUS Status;
// ASSERT (Pages != 0); // ASSERT (Pages != 0);
if (Pages != 0) { if (!Pages) {
gBS->FreePages((EFI_PHYSICAL_ADDRESS)(UINTN)Buffer, Pages); return;
} }
Status = gBS->FreePages ((EFI_PHYSICAL_ADDRESS) (UINTN) Buffer, Pages);
// ASSERT_EFI_ERROR (Status); // ASSERT_EFI_ERROR (Status);
if (EFI_ERROR (Status)) {
return;
}
} }
/** /**
@ -183,7 +187,10 @@ InternalAllocateAlignedPages (
// //
// Alignment must be a power of two or zero. // Alignment must be a power of two or zero.
// //
ASSERT ((Alignment & (Alignment - 1)) == 0); // ASSERT ((Alignment & (Alignment - 1)) == 0);
if ((Alignment & (Alignment - 1)) != 0) {
return NULL;
}
if (Pages == 0) { if (Pages == 0) {
return NULL; return NULL;
@ -197,7 +204,10 @@ InternalAllocateAlignedPages (
// //
// Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow. // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.
// //
ASSERT (RealPages > Pages); // ASSERT (RealPages > Pages);
if (RealPages < Pages) {
return NULL;
}
Status = gBS->AllocatePages (AllocateAnyPages, MemoryType, RealPages, &Memory); Status = gBS->AllocatePages (AllocateAnyPages, MemoryType, RealPages, &Memory);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
@ -210,7 +220,10 @@ InternalAllocateAlignedPages (
// Free first unaligned page(s). // Free first unaligned page(s).
// //
Status = gBS->FreePages (Memory, UnalignedPages); Status = gBS->FreePages (Memory, UnalignedPages);
ASSERT_EFI_ERROR (Status); // ASSERT_EFI_ERROR (Status);
if (EFI_ERROR (Status)) {
return NULL;
}
} }
Memory = AlignedMemory + EFI_PAGES_TO_SIZE (Pages); Memory = AlignedMemory + EFI_PAGES_TO_SIZE (Pages);
UnalignedPages = RealPages - Pages - UnalignedPages; UnalignedPages = RealPages - Pages - UnalignedPages;
@ -218,8 +231,11 @@ InternalAllocateAlignedPages (
// //
// Free last unaligned page(s). // Free last unaligned page(s).
// //
/* Status = */ gBS->FreePages (Memory, UnalignedPages); Status = gBS->FreePages (Memory, UnalignedPages);
// ASSERT_EFI_ERROR (Status); // ASSERT_EFI_ERROR (Status);
if (EFI_ERROR (Status)) {
return NULL;
}
} }
} else { } else {
// //
@ -344,9 +360,11 @@ FreeAlignedPages (
{ {
// EFI_STATUS Status; // EFI_STATUS Status;
if (Pages != 0) { // ASSERT (Pages != 0);
/* Status = */ gBS->FreePages((EFI_PHYSICAL_ADDRESS)(UINTN)Buffer, Pages); if (!Pages || !Buffer) {
return;
} }
/* Status = */gBS->FreePages ((EFI_PHYSICAL_ADDRESS) (UINTN) Buffer, Pages);
// ASSERT_EFI_ERROR (Status); // ASSERT_EFI_ERROR (Status);
} }
@ -370,12 +388,7 @@ InternalAllocatePool (
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
VOID *Memory = NULL; VOID *Memory;
if (AllocationSize == 0)
{
return NULL;
}
Status = gBS->AllocatePool (MemoryType, AllocationSize, &Memory); Status = gBS->AllocatePool (MemoryType, AllocationSize, &Memory);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
@ -567,13 +580,15 @@ InternalAllocateCopyPool (
) )
{ {
VOID *Memory; VOID *Memory;
if (!Buffer || (AllocationSize > (MAX_ADDRESS - (UINTN)Buffer + 1)))
{
return NULL;
}
// ASSERT (Buffer != NULL); // ASSERT (Buffer != NULL);
if (!Buffer) {
return NULL;
}
// ASSERT (AllocationSize <= (MAX_ADDRESS - (UINTN) Buffer + 1)); // ASSERT (AllocationSize <= (MAX_ADDRESS - (UINTN) Buffer + 1));
if (AllocationSize > (MAX_ADDRESS - (UINTN) Buffer + 1)) {
return NULL;
}
Memory = InternalAllocatePool (PoolType, AllocationSize); Memory = InternalAllocatePool (PoolType, AllocationSize);
if (Memory != NULL) { if (Memory != NULL) {