Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-23 11:35:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

more robust search symbols

Browse Source 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
SergeySlice 2020-06-27 05:57:27 +03:00
parent 428c6bb35a
commit 982332e440
2 changed files with 69 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
rEFIt_UEFI/Platform/kernel_patcher.cpp
View File

@ -24,8 +24,10 @@
#endif #endif
#if KERNEL_DEBUG #if KERNEL_DEBUG == 2
#define DBG(...) printf(__VA_ARGS__); #define DBG(...) printf(__VA_ARGS__);
#elif KERNEL_DEBUG == 1
#define DBG(...) DebugLog(KERNEL_DEBUG, __VA_ARGS__)
#else #else
#define DBG(...) #define DBG(...)
#endif #endif
@ -71,19 +73,27 @@ VOID LOADER_ENTRY::SetKernelRelocBase()
// the purpose of the procedure is to find a table of symbols in the kernel // the purpose of the procedure is to find a table of symbols in the kernel
EFI_STATUS LOADER_ENTRY::getVTable() EFI_STATUS LOADER_ENTRY::getVTable()
{ {
DBG("kernel at 0x%llx\n", (UINTN)KernelData);
INT32 LinkAdr = FindBin(KernelData, 0x3000, (const UINT8 *)kLinkEditSegment, (UINT32)strlen(kLinkEditSegment)); INT32 LinkAdr = FindBin(KernelData, 0x3000, (const UINT8 *)kLinkEditSegment, (UINT32)strlen(kLinkEditSegment));
if (LinkAdr == -1) { if (LinkAdr == -1) {
DBG("no LinkEdit\n");
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
// const UINT8 vtable[] = {0x04, 00,00,00, 0x0F, 0x08, 00, 00}; // const UINT8 vtable[] = {0x04, 00,00,00, 0x0F, 0x08, 00, 00};
// const UINT8 vtableSur[] = {0x25, 00,00,00, 0x0F, 0x06, 00, 00};
//25000000 0F060000 940BFF00 80FFFFFF
//00FFFFFF FF0FFFFF 00000000 FFFFFFFF
// INT32 Tabble = FindBin(kernel, 0x2000000, vtable, 8); // INT32 Tabble = FindBin(KernelData, 0x5000000, vtableSur, 8);
INT32 NTabble = FindBin(KernelData, 0x2000000, (const UINT8 *)ctor_used, (UINT32)strlen(ctor_used)); INT32 NTabble = FindBin(KernelData, 0x5000000, (const UINT8 *)ctor_used, (UINT32)strlen(ctor_used));
if (NTabble < 0) { if (NTabble < 0) {
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
NTabble -=4; while (KernelData[NTabble] || KernelData[NTabble-1]) --NTabble;
// DBG_RT("LinkAdr=%x Tabble=%x\n",LinkAdr, NTabble); NTabble &= ~0x03; //align, may be 0x07?
// NTabble -=4;
DBG_RT("LinkAdr=%x Tabble=%x\n",LinkAdr, NTabble);
// DBG("LinkAdr=%x NTabble=%x Tabble=%x\n",LinkAdr, NTabble, Tabble);
SEGMENT *LinkSeg = (SEGMENT*)&KernelData[LinkAdr]; SEGMENT *LinkSeg = (SEGMENT*)&KernelData[LinkAdr];
AddrVtable = LinkSeg->AddrVtable; AddrVtable = LinkSeg->AddrVtable;
SizeVtable = LinkSeg->SizeVtable; SizeVtable = LinkSeg->SizeVtable;
@ -93,7 +103,10 @@ EFI_STATUS LOADER_ENTRY::getVTable()
// DBG_RT("AddrVtable=%x Size=%x AddrNames=%x shift=%x\n", AddrVtable, SizeVtable, NamesTable, shift); // DBG_RT("AddrVtable=%x Size=%x AddrNames=%x shift=%x\n", AddrVtable, SizeVtable, NamesTable, shift);
NamesTable = NTabble; NamesTable = NTabble;
AddrVtable += shift; AddrVtable += shift;
// AddrVtable = Tabble;
DBG("AddrVtable=%x Size=%x AddrNames=%x shift=%x\n", AddrVtable, SizeVtable, NamesTable, shift);
SegVAddr = FindBin(KernelData, 0x600, (const UINT8 *)kTextSegment, (UINT32)strlen(kTextSegment)); SegVAddr = FindBin(KernelData, 0x600, (const UINT8 *)kTextSegment, (UINT32)strlen(kTextSegment));
DBG("SegVAddr=0x%x\n", SegVAddr);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
@ -175,6 +188,7 @@ UINTN LOADER_ENTRY::searchProcInDriver(UINT8 * driver, UINT32 driverLen, const c
return procAddr; return procAddr;
} }
//static int N = 0;
//search a procedure by Name and return its offset in the kernel //search a procedure by Name and return its offset in the kernel
UINTN LOADER_ENTRY::searchProc(const char *procedure) UINTN LOADER_ENTRY::searchProc(const char *procedure)
{ {
@ -191,7 +205,11 @@ UINTN LOADER_ENTRY::searchProc(const char *procedure)
for (i=0; i<SizeVtable; ++i) { for (i=0; i<SizeVtable; ++i) {
size_t Offset = vArray[i].NameOffset; size_t Offset = vArray[i].NameOffset;
if (Offset == 0) break; if (Offset == 0) break;
// if (N < 10) {
// DBG("Offset %lx Seg=%x\n", Offset, vArray[i].Seg);
// DBG("Name to compare %s\n", &Names[Offset]);
// N++;
// }
// DBG_RT("Offset %lx Seg=%x\n", Offset, vArray[i].Seg); // DBG_RT("Offset %lx Seg=%x\n", Offset, vArray[i].Seg);
// DBG_RT("Name to compare %s\n", &Names[Offset]); // DBG_RT("Name to compare %s\n", &Names[Offset]);
// Stall(3000000); // Stall(3000000);
@ -1912,9 +1930,14 @@ VOID LOADER_ENTRY::Get_PreLink()
switch (loadCommand->cmd) { switch (loadCommand->cmd) {
case LC_SEGMENT_64: case LC_SEGMENT_64:
segCmd64 = (struct segment_command_64 *)loadCommand; segCmd64 = (struct segment_command_64 *)loadCommand;
//DBG("segCmd64->segname = %s\n",segCmd64->segname); //segn = (UINT32)(UINTN)segCmd64->segname;
//DBG("segCmd64->vmaddr = 0x%08X\n",segCmd64->vmaddr) if ((segCmd64->segname[2] != 'R') || (segCmd64->segname[3] != 'E')) {
//DBG("segCmd64->vmsize = 0x%08X\n",segCmd64->vmsize); DBG("found segment at 0x%x\n", binaryIndex);
DBG("segCmd64->segname = %s\n",segCmd64->segname);
DBG("segCmd64->vmaddr = 0x%08llX\n",segCmd64->vmaddr);
DBG("segCmd64->vmsize = 0x%08llX\n",segCmd64->vmsize);
// Stall(5000000);
}
if (AsciiStrCmp(segCmd64->segname, kPrelinkTextSegment) == 0) { if (AsciiStrCmp(segCmd64->segname, kPrelinkTextSegment) == 0) {
DBG("Found PRELINK_TEXT, 64bit\n"); DBG("Found PRELINK_TEXT, 64bit\n");
if (segCmd64->vmsize > 0) { if (segCmd64->vmsize > 0) {
@ -1924,7 +1947,7 @@ VOID LOADER_ENTRY::Get_PreLink()
PrelinkTextSize = (UINT32)segCmd64->vmsize; PrelinkTextSize = (UINT32)segCmd64->vmsize;
PrelinkTextLoadCmdAddr = (UINT32)(UINTN)segCmd64; PrelinkTextLoadCmdAddr = (UINT32)(UINTN)segCmd64;
} }
DBG("at %p: vmaddr = 0x%llx, vmsize = 0x%llx\n", segCmd64, segCmd64->vmaddr, segCmd64->vmsize); DBG("at 0x%llx: vmaddr = 0x%llx, vmsize = 0x%llx\n", (UINTN)segCmd64, segCmd64->vmaddr, segCmd64->vmsize);
DBG("PrelinkTextLoadCmdAddr = 0x%X, PrelinkTextAddr = 0x%X, PrelinkTextSize = 0x%X\n", DBG("PrelinkTextLoadCmdAddr = 0x%X, PrelinkTextAddr = 0x%X, PrelinkTextSize = 0x%X\n",
PrelinkTextLoadCmdAddr, PrelinkTextAddr, PrelinkTextSize); PrelinkTextLoadCmdAddr, PrelinkTextAddr, PrelinkTextSize);
//DBG("cmd = 0x%08X\n",segCmd64->cmd); //DBG("cmd = 0x%08X\n",segCmd64->cmd);
@ -1967,11 +1990,18 @@ VOID LOADER_ENTRY::Get_PreLink()
PrelinkInfoAddr = (UINT32)(sect->addr ? sect->addr + KernelRelocBase : 0); PrelinkInfoAddr = (UINT32)(sect->addr ? sect->addr + KernelRelocBase : 0);
PrelinkInfoSize = (UINT32)sect->size; PrelinkInfoSize = (UINT32)sect->size;
} }
DBG("__info found at %p: addr = 0x%llx, size = 0x%llx\n", sect, sect->addr, sect->size); DBG("__info found at 0x%llx: addr = 0x%llx, size = 0x%llx\n", (UINTN)sect, sect->addr, sect->size);
DBG("PrelinkInfoLoadCmdAddr = 0x%X, PrelinkInfoAddr = 0x%X, PrelinkInfoSize = 0x%X\n", DBG("PrelinkInfoLoadCmdAddr = 0x%X, PrelinkInfoAddr = 0x%X, PrelinkInfoSize = 0x%X\n",
PrelinkInfoLoadCmdAddr, PrelinkInfoAddr, PrelinkInfoSize); PrelinkInfoLoadCmdAddr, PrelinkInfoAddr, PrelinkInfoSize);
} }
} }
}
if (AsciiStrCmp(segCmd64->segname, kLinkEditSegment) == 0) {
SEGMENT *LinkSeg = (SEGMENT *)segCmd64->segname;
DBG("segCmd64->AddrVtable = 0x%08X\n",LinkSeg->AddrVtable); //0x48 f291d0
DBG("segCmd64->SizeVtable = 0x%08X\n", LinkSeg->SizeVtable); //0x4C 6031
DBG("segCmd64->AddrNames = 0x%08X\n", LinkSeg->AddrNames); //0x50 f894e0
} }
break; break;
@ -1988,7 +2018,7 @@ VOID LOADER_ENTRY::Get_PreLink()
PrelinkTextSize = (UINT32)segCmd->vmsize; PrelinkTextSize = (UINT32)segCmd->vmsize;
PrelinkTextLoadCmdAddr = (UINT32)(UINTN)segCmd; PrelinkTextLoadCmdAddr = (UINT32)(UINTN)segCmd;
} }
DBG("at %p: vmaddr = 0x%x, vmsize = 0x%x\n", segCmd, segCmd->vmaddr, segCmd->vmsize); DBG("at 0x%llx: vmaddr = 0x%x, vmsize = 0x%x\n", (UINTN)segCmd, segCmd->vmaddr, segCmd->vmsize);
DBG("PrelinkTextLoadCmdAddr = 0x%X, PrelinkTextAddr = 0x%X, PrelinkTextSize = 0x%X\n", DBG("PrelinkTextLoadCmdAddr = 0x%X, PrelinkTextAddr = 0x%X, PrelinkTextSize = 0x%X\n",
PrelinkTextLoadCmdAddr, PrelinkTextAddr, PrelinkTextSize); PrelinkTextLoadCmdAddr, PrelinkTextAddr, PrelinkTextSize);
//gBS->Stall(30*1000000); //gBS->Stall(30*1000000);
@ -2021,7 +2051,7 @@ VOID LOADER_ENTRY::Get_PreLink()
PrelinkInfoAddr = (UINT32)(sect->addr ? sect->addr + KernelRelocBase : 0); PrelinkInfoAddr = (UINT32)(sect->addr ? sect->addr + KernelRelocBase : 0);
PrelinkInfoSize = (UINT32)sect->size; PrelinkInfoSize = (UINT32)sect->size;
} }
DBG("__info found at %p: addr = 0x%x, size = 0x%x\n", sect, sect->addr, sect->size); DBG("__info found at 0x%llx: addr = 0x%x, size = 0x%x\n", (UINTN)sect, sect->addr, sect->size);
DBG("PrelinkInfoLoadCmdAddr = 0x%X, PrelinkInfoAddr = 0x%X, PrelinkInfoSize = 0x%X\n", DBG("PrelinkInfoLoadCmdAddr = 0x%X, PrelinkInfoAddr = 0x%X, PrelinkInfoSize = 0x%X\n",
PrelinkInfoLoadCmdAddr, PrelinkInfoAddr, PrelinkInfoSize); PrelinkInfoLoadCmdAddr, PrelinkInfoAddr, PrelinkInfoSize);
//gBS->Stall(30*1000000); //gBS->Stall(30*1000000);
@ -2067,7 +2097,7 @@ LOADER_ENTRY::FindBootArgs()
KernelSlide = bootArgs2->kslide; KernelSlide = bootArgs2->kslide;
DBG_RT( "Found bootArgs2 at 0x%llX, DevTree at 0x%llX\n", (UINTN)ptr, (UINTN)bootArgs2->deviceTreeP); DBG_RT( "Found bootArgs2 at 0x%llX, DevTree at 0x%llX\n", (UINTN)ptr, (UINTN)bootArgs2->deviceTreeP);
//DBG("bootArgs2->kaddr = 0x%08X and bootArgs2->ksize = 0x%08X\n", bootArgs2->kaddr, bootArgs2->ksize); //DBG_RT("bootArgs2->kaddr = 0x%llX and bootArgs2->ksize = 0x%llX\n", bootArgs2->kaddr, bootArgs2->ksize);
//DBG("bootArgs2->efiMode = 0x%02X\n", bootArgs2->efiMode); //DBG("bootArgs2->efiMode = 0x%02X\n", bootArgs2->efiMode);
DBG_RT( "bootArgs2->CommandLine = %s\n", bootArgs2->CommandLine); DBG_RT( "bootArgs2->CommandLine = %s\n", bootArgs2->CommandLine);
DBG_RT( "bootArgs2->flags = 0x%hx\n", bootArgs2->flags); DBG_RT( "bootArgs2->flags = 0x%hx\n", bootArgs2->flags);
@ -2112,6 +2142,7 @@ LOADER_ENTRY::FindBootArgs()
break; break;
} }
} }
/*
if (bootArgs2 == 0) { if (bootArgs2 == 0) {
ptr = (UINT8*)0x200000ull; ptr = (UINT8*)0x200000ull;
while(TRUE) { while(TRUE) {
@ -2142,6 +2173,7 @@ LOADER_ENTRY::FindBootArgs()
} }
} }
} }
*/
} }
BOOLEAN BOOLEAN
@ -2304,13 +2336,13 @@ LOADER_ENTRY::KernelAndKextPatcherInit()
// for ML: bootArgs2->kslide + 0x00200000 // for ML: bootArgs2->kslide + 0x00200000
// for AptioFix booting - it's always at KernelRelocBase + 0x00200000 // for AptioFix booting - it's always at KernelRelocBase + 0x00200000
UINT64 os_version = AsciiOSVersionToUint64(OSVersion); // UINT64 os_version = AsciiOSVersionToUint64(OSVersion);
DBG_RT("os_version=%s\n", OSVersion); DBG_RT("os_version=%s\n", OSVersion);
if (os_version < AsciiOSVersionToUint64("10.6")) { // if (os_version < AsciiOSVersionToUint64("10.6")) {
KernelData = (UINT8*)(UINTN)(KernelSlide + KernelRelocBase + 0x00111000); // KernelData = (UINT8*)(UINTN)(KernelSlide + KernelRelocBase + 0x00111000);
} else { // } else {
KernelData = (UINT8*)(UINTN)(KernelSlide + KernelRelocBase + 0x00200000); KernelData = (UINT8*)(UINTN)(KernelSlide + KernelRelocBase + 0x00200000);
} // }
// check that it is Mach-O header and detect architecture // check that it is Mach-O header and detect architecture
if(MACH_GET_MAGIC(KernelData) == MH_MAGIC || MACH_GET_MAGIC(KernelData) == MH_CIGAM) { if(MACH_GET_MAGIC(KernelData) == MH_MAGIC || MACH_GET_MAGIC(KernelData) == MH_CIGAM) {
@ -2318,6 +2350,7 @@ LOADER_ENTRY::KernelAndKextPatcherInit()
is64BitKernel = FALSE; is64BitKernel = FALSE;
} else if (MACH_GET_MAGIC(KernelData) == MH_MAGIC_64 || MACH_GET_MAGIC(KernelData) == MH_CIGAM_64) { } else if (MACH_GET_MAGIC(KernelData) == MH_MAGIC_64 || MACH_GET_MAGIC(KernelData) == MH_CIGAM_64) {
DBG_RT( "Found 64 bit kernel at 0x%llx\n", (UINTN)KernelData); DBG_RT( "Found 64 bit kernel at 0x%llx\n", (UINTN)KernelData);
DBG_RT("text section is: %s\n", (const char*)&KernelData[0x28]);
is64BitKernel = TRUE; is64BitKernel = TRUE;
} else { } else {
// not valid Mach-O header - exiting // not valid Mach-O header - exiting
@ -2328,6 +2361,18 @@ LOADER_ENTRY::KernelAndKextPatcherInit()
// find __PRELINK_TEXT and __PRELINK_INFO // find __PRELINK_TEXT and __PRELINK_INFO
Get_PreLink(); Get_PreLink();
for (UINTN i=0x00200000; i<0x30000000; i+=4) {
UINT32 *KD = (UINT32 *)i;
if ((KD[0] == MH_MAGIC_64) && (KD[0x0a] == 0x45545F5F)){
DBG_RT( "Found MAGIC at %llx, text=%s\n", i, (const char*)&KD[0x0a]);
DBG( "Found MAGIC at %llx, text=%s\n", i, (const char*)&KD[0x0a]);
KernelData = (UINT8*)KD;
DBG( "Found new kernel at 0x%llx\n", (UINTN)KernelData);
break;
}
}
if (EFI_ERROR(getVTable())) { if (EFI_ERROR(getVTable())) {
DBG_RT("error getting vtable: \n"); DBG_RT("error getting vtable: \n");
} }
@ -2539,7 +2584,7 @@ LOADER_ENTRY::KernelAndKextsPatcherStart()
DBG_RT( "Disabled\n"); DBG_RT( "Disabled\n");
} }
Stall(10000000); Stall(1000000);
// //
// Kext add // Kext add
@ -2583,7 +2628,7 @@ LOADER_ENTRY::KernelAndKextsPatcherStart()
} else return; } else return;
Status = InjectKexts(deviceTreeP, deviceTreeLength); Status = InjectKexts(deviceTreeP, deviceTreeLength);
DBG_RT("Inject kexts done at 0x%llx\n", (UINTN)deviceTreeP);
if (!EFI_ERROR(Status)) KernelBooterExtensionsPatch(); if (!EFI_ERROR(Status)) KernelBooterExtensionsPatch();
} }

3
rEFIt_UEFI/Platform/kext_inject.cpp
View File

@ -301,7 +301,7 @@ VOID LOADER_ENTRY::AddKexts(CONST CHAR16 *SrcDir, CONST CHAR16 *Path, cpu_type_t
MsgLog("Preparing kexts injection for arch=%ls from %ls\n", (archCpuType==CPU_TYPE_X86_64)?L"x86_64":(archCpuType==CPU_TYPE_I386)?L"i386":L"", SrcDir); MsgLog("Preparing kexts injection for arch=%ls from %ls\n", (archCpuType==CPU_TYPE_X86_64)?L"x86_64":(archCpuType==CPU_TYPE_I386)?L"i386":L"", SrcDir);
CurrentKext = InjectKextList; CurrentKext = InjectKextList;
while (CurrentKext) { while (CurrentKext) {
DBG(" current kext name=%ls path=%ls, match against=%ls\n", CurrentKext->FileName, CurrentKext->KextDirNameUnderOEMPath, Path); // DBG(" current kext name=%ls path=%ls, match against=%ls\n", CurrentKext->FileName, CurrentKext->KextDirNameUnderOEMPath, Path);
if (StrCmp(CurrentKext->KextDirNameUnderOEMPath, Path) == 0) { if (StrCmp(CurrentKext->KextDirNameUnderOEMPath, Path) == 0) {
FileName = PoolPrint(L"%s\\%s", SrcDir, CurrentKext->FileName); FileName = PoolPrint(L"%s\\%s", SrcDir, CurrentKext->FileName);
// snwprintf(FileName, 512, "%s\\%s", SrcDir, CurrentKext->FileName); // snwprintf(FileName, 512, "%s\\%s", SrcDir, CurrentKext->FileName);
@ -1088,6 +1088,7 @@ VOID EFIAPI LOADER_ENTRY::KernelBooterExtensionsPatch()
UINTN taskLocation = searchProc("IOTaskHasEntitlement"); UINTN taskLocation = searchProc("IOTaskHasEntitlement");
procLocation = searchProc("loadExecutable"); procLocation = searchProc("loadExecutable");
patchLocation2 = FindMemMask(&KernelData[procLocation], 0x1000, find3, sizeof(find3), mask3, sizeof(mask3)); patchLocation2 = FindMemMask(&KernelData[procLocation], 0x1000, find3, sizeof(find3), mask3, sizeof(mask3));
DBG("IOTaskHasEntitlement at 0x%llx, loadExecutable at 0x%llx\n", taskLocation, procLocation);
if (patchLocation2 != KERNEL_MAX_SIZE) { if (patchLocation2 != KERNEL_MAX_SIZE) {
DBG_RT("=> patch SIP applied\n"); DBG_RT("=> patch SIP applied\n");
patchLocation2 += procLocation; patchLocation2 += procLocation;