Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-09-21 02:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply last patch's idea to LocalApicNMI as well

Browse Source 
and resolves an uninitialized read:
......
   LocalApicNMI++;
   ApicTable->Length += LocalApicNMI->Length;
......
This commit is contained in:
Florin9doi 2019-09-14 17:02:39 +03:00
parent d5021f3f04
commit ebcac449c7
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rEFIt_UEFI/Platform/AcpiPatcher.c
View File

@ -1718,7 +1718,6 @@ EFI_STATUS PatchACPI(IN REFIT_VOLUME *Volume, CHAR8 *OSVersion)
BOOLEAN DsdtLoaded = FALSE; BOOLEAN DsdtLoaded = FALSE;
BOOLEAN NeedUpdate = FALSE; BOOLEAN NeedUpdate = FALSE;
OPER_REGION *tmpRegion; OPER_REGION *tmpRegion;
INTN ApicCPUBase = 0;
CHAR16* AcpiOemPath = PoolPrint(L"%s\\ACPI\\patched", OEMPath); CHAR16* AcpiOemPath = PoolPrint(L"%s\\ACPI\\patched", OEMPath);
DbgHeader("PatchACPI"); DbgHeader("PatchACPI");
@ -2128,12 +2127,6 @@ EFI_STATUS PatchACPI(IN REFIT_VOLUME *Volume, CHAR8 *OSVersion)
ApicTable = (EFI_ACPI_DESCRIPTION_HEADER*)(UINTN)(*xf); ApicTable = (EFI_ACPI_DESCRIPTION_HEADER*)(UINTN)(*xf);
// ApicLen = ApicTable->Length; // ApicLen = ApicTable->Length;
ProcLocalApic = (EFI_ACPI_2_0_PROCESSOR_LOCAL_APIC_STRUCTURE *)(UINTN)(*xf + sizeof(EFI_ACPI_2_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER)); ProcLocalApic = (EFI_ACPI_2_0_PROCESSOR_LOCAL_APIC_STRUCTURE *)(UINTN)(*xf + sizeof(EFI_ACPI_2_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER));
//determine first ID of CPU. This must be 0 for Mac and for good Hack
// but = 1 for stupid ASUS
//
if (ProcLocalApic->Type == EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC) {
ApicCPUBase = ProcLocalApic->AcpiProcessorId; //we want first instance
}
while ((ProcLocalApic->Type == EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC) && (ProcLocalApic->Length == 8)) { while ((ProcLocalApic->Type == EFI_ACPI_4_0_PROCESSOR_LOCAL_APIC) && (ProcLocalApic->Length == 8)) {
if (ProcLocalApic->Flags & EFI_ACPI_4_0_LOCAL_APIC_ENABLED) { if (ProcLocalApic->Flags & EFI_ACPI_4_0_LOCAL_APIC_ENABLED) {
@ -2150,7 +2143,7 @@ EFI_STATUS PatchACPI(IN REFIT_VOLUME *Volume, CHAR8 *OSVersion)
ApicCPUNum = gCPUStructure.Threads; ApicCPUNum = gCPUStructure.Threads;
} }
DBG("ApicCPUBase=%d ApicCPUNum=%d\n", ApicCPUBase, ApicCPUNum); DBG("ApicCPUNum=%d\n", ApicCPUNum);
//reallocate table //reallocate table
if (gSettings.PatchNMI) { if (gSettings.PatchNMI) {
BufferPtr = EFI_SYSTEM_TABLE_MAX_ADDRESS; BufferPtr = EFI_SYSTEM_TABLE_MAX_ADDRESS;
@ -2198,11 +2191,11 @@ EFI_STATUS PatchACPI(IN REFIT_VOLUME *Volume, CHAR8 *OSVersion)
for (Index = 0; Index < ApicCPUNum; Index++) { for (Index = 0; Index < ApicCPUNum; Index++) {
LocalApicNMI->Type = EFI_ACPI_4_0_LOCAL_APIC_NMI; LocalApicNMI->Type = EFI_ACPI_4_0_LOCAL_APIC_NMI;
LocalApicNMI->Length = sizeof(EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE); LocalApicNMI->Length = sizeof(EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE);
LocalApicNMI->AcpiProcessorId = (UINT8)(ApicCPUBase + Index); LocalApicNMI->AcpiProcessorId = acpi_cpu_processor_id[Index];
LocalApicNMI->Flags = 5; LocalApicNMI->Flags = 5;
LocalApicNMI->LocalApicLint = 1; LocalApicNMI->LocalApicLint = 1;
LocalApicNMI++; LocalApicNMI++;
ApicTable->Length += LocalApicNMI->Length; ApicTable->Length += sizeof(EFI_ACPI_4_0_LOCAL_APIC_NMI_STRUCTURE);
} }
DBG("ApicTable new Length=%d\n", ApicTable->Length); DBG("ApicTable new Length=%d\n", ApicTable->Length);
// insert corrected MADT // insert corrected MADT