tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-09-25 10:47:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

BaseUeImageLib: Fixed buggy alignment in unchaining process.

Browse Source
This commit is contained in:
Mikhail Krichanov 2023-09-18 11:23:39 +03:00 committed by MikhailKrichanov
parent 33ef407f5e
commit 3668735164
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
MdePkg/Library/BaseUeImageLib/UeImageLib.c
View File

@ -614,6 +614,7 @@ UnchainReloc (
UINT32 OldSize;
UINT16 FixupHdr;
UINT32 FixupIndex;
UINT8 Addend;
if ((RuntimeContext != NULL) && !IsRuntime) {
if (MetaSource == NULL) {
@ -624,6 +625,22 @@ UnchainReloc (
*(UINT16 *)&RuntimeContext->UnchainedRelocs[FixupIndex] = FixupHdr;
Addend = ALIGN_VALUE_ADDEND(RuntimeContext->UnchainedRelocsSize, ALIGNOF(UE_FIXUP_ROOT));
if ((RelocOffset == UE_HEAD_FIXUP_OFFSET_END) && (Addend != 0)) {
OldSize = RuntimeContext->UnchainedRelocsSize;
RuntimeContext->UnchainedRelocs = ReallocateRuntimePool (
OldSize,
OldSize + Addend,
RuntimeContext->UnchainedRelocs
);
if (RuntimeContext->UnchainedRelocs == NULL) {
return RETURN_OUT_OF_RESOURCES;
}
ZeroMem (RuntimeContext->UnchainedRelocs + OldSize, Addend);
RuntimeContext->UnchainedRelocsSize += Addend;
}
return RETURN_SUCCESS;
}
@ -742,7 +759,7 @@ InternalProcessRelocChain (
// Imitate the common header of UE chained relocation fixups,
// as for 32-bit files all relocs have the same type.
//
FixupInfo.Value32 = FixupInfo.Value32 << 4;
FixupInfo.Value32 = FixupInfo.Value32 << 4U;
FixupInfo.Value32 |= UeReloc32;
} else {
//
@ -762,7 +779,7 @@ InternalProcessRelocChain (
RelocTarget += FixupSize;
RelocOffset = UE_CHAINED_RELOC_FIXUP_NEXT_OFFSET (FixupInfo.Value32);
FixupHdr = (RelocOffset << 4) | RelocType;
FixupHdr = (RelocOffset << 4U) | RelocType;
Status = UnchainReloc (
RuntimeContext,