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

names table shifted

Browse Source 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
SergeySlice 2020-07-27 11:45:17 +03:00
parent 15b65bd95b
commit b291971c46
3 changed files with 59 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rEFIt_UEFI/Platform/kernel_patcher.cpp
View File

@ -23,7 +23,7 @@
//#include "sse3_5_patcher.h" //#include "sse3_5_patcher.h"
#ifndef DEBUG_ALL #ifndef DEBUG_ALL
#define KERNEL_DEBUG 1 #define KERNEL_DEBUG 0
#else #else
#define KERNEL_DEBUG DEBUG_ALL #define KERNEL_DEBUG DEBUG_ALL
#endif #endif
@ -198,15 +198,15 @@ UINTN LOADER_ENTRY::searchProcInDriver(UINT8 * driver, UINT32 driverLen, const c
const char* Names = NULL; const char* Names = NULL;
struct symtab_command *symCmd = NULL; struct symtab_command *symCmd = NULL;
UINT32 symCmdOffset = Get_Symtab(driver); UINT32 symCmdOffset = Get_Symtab(driver);
DBG("symCmdOffset=0x%X\n", symCmdOffset); DBG("symCmdOffset=0x%X\n", symCmdOffset); //0x418
if (symCmdOffset != 0) { if (symCmdOffset != 0) {
if ((((struct mach_header_64*)KernelData)->filetype) == MH_KERNEL_COLLECTION) { if ((((struct mach_header_64*)KernelData)->filetype) == MH_KERNEL_COLLECTION) {
symCmd = (struct symtab_command *)&KernelData[symCmdOffset]; symCmd = (struct symtab_command *)&driver[symCmdOffset];
vArray = (struct nlist_64*)(&KernelData[symCmd->symoff]); vArray = (struct nlist_64*)(&KernelData[symCmd->symoff - shift]);
lSizeVtable = symCmd->nsyms; lSizeVtable = symCmd->nsyms;
Names = (const char*)(&KernelData[symCmd->stroff]); Names = (const char*)(&KernelData[symCmd->stroff - shift]);
DBG("driverKC: AddrVtable=0x%x SizeVtable=0x%x NamesTable=0x%x\n", symCmd->symoff, lSizeVtable, symCmd->stroff); DBG("driverKC: AddrVtable=0x%x SizeVtable=0x%x NamesTable=0x%x\n",
symCmd->symoff - shift, lSizeVtable, symCmd->stroff - shift);
} else { } else {
symCmd = (struct symtab_command *)&driver[symCmdOffset]; symCmd = (struct symtab_command *)&driver[symCmdOffset];
vArray = (struct nlist_64*)(&driver[symCmd->symoff]); vArray = (struct nlist_64*)(&driver[symCmd->symoff]);

2
rEFIt_UEFI/Platform/kext_inject.cpp
View File

@ -3,7 +3,7 @@
#include "DataHubCpu.h" #include "DataHubCpu.h"
#ifndef DEBUG_ALL #ifndef DEBUG_ALL
#define KEXT_INJECT_DEBUG 1 #define KEXT_INJECT_DEBUG 0
#else #else
#define KEXT_INJECT_DEBUG DEBUG_ALL #define KEXT_INJECT_DEBUG DEBUG_ALL
#endif #endif

75
rEFIt_UEFI/Platform/kext_patcher.cpp
View File

@ -22,7 +22,7 @@ extern "C" {
#ifndef DEBUG_ALL #ifndef DEBUG_ALL
#define KEXT_DEBUG 1 #define KEXT_DEBUG 0
#else #else
#define KEXT_DEBUG DEBUG_ALL #define KEXT_DEBUG DEBUG_ALL
#endif #endif
@ -601,7 +601,7 @@ VOID LOADER_ENTRY::AppleRTCPatch(UINT8 *Driver, UINT32 DriverSize, CHAR8 *InfoPl
if (NumLion_X64 + NumLion_i386 + NumML + NumMavMoj3 + NumMoj4 > 1) { if (NumLion_X64 + NumLion_i386 + NumML + NumMavMoj3 + NumMoj4 > 1) {
// more then one pattern found - we do not know what to do with it // more then one pattern found - we do not know what to do with it
// and we'll skip it // and we'll skip it
printf("AppleRTCPatch: ERROR: multiple patterns found (LionX64: %llu, Lioni386: %llu, ML: %llu, MavMoj3: %llu, Moj4: %llu) - skipping patching!\n", DBG_RT("AppleRTCPatch: ERROR: multiple patterns found (LionX64: %llu, Lioni386: %llu, ML: %llu, MavMoj3: %llu, Moj4: %llu) - skipping patching!\n",
NumLion_X64, NumLion_i386, NumML, NumMavMoj3, NumMoj4); NumLion_X64, NumLion_i386, NumML, NumMavMoj3, NumMoj4);
Stall(5000000); Stall(5000000);
return; return;
@ -629,9 +629,23 @@ VOID LOADER_ENTRY::AppleRTCPatch(UINT8 *Driver, UINT32 DriverSize, CHAR8 *InfoPl
//RodionS //RodionS
UINTN procLocation = searchProcInDriver(Driver, DriverSize, "updateChecksum"); UINTN procLocation = searchProcInDriver(Driver, DriverSize, "updateChecksum");
DBG("updateChecksum at 0x%llx", procLocation); DBG("updateChecksum at 0x%llx\n", procLocation);
if (procLocation != 0) { if (procLocation != 0) {
Driver[procLocation] = 0xC3; if ((((struct mach_header_64*)KernelData)->filetype) == MH_KERNEL_COLLECTION) {
DBG("procedure in kernel space\n");
for (int j = 0; j < 20; ++j) {
DBG("%02X", KernelData[procLocation + j]);
}
DBG("\n");
KernelData[procLocation] = 0xC3;
} else {
DBG("procedure in Driver space\n");
for (int j = 0; j < 20; ++j) {
DBG("%02X", Driver[procLocation + j]);
}
DBG("\n");
Driver[procLocation] = 0xC3;
}
DBG_RT("AppleRTC: patched\n"); DBG_RT("AppleRTC: patched\n");
} else { } else {
DBG_RT("AppleRTC: not patched\n"); DBG_RT("AppleRTC: not patched\n");
@ -1039,28 +1053,41 @@ VOID LOADER_ENTRY::EightApplePatch(UINT8 *Driver, UINT32 DriverSize)
DBG("8 apple patch\n"); DBG("8 apple patch\n");
UINTN procAddr = searchProcInDriver(Driver, DriverSize, "initFB"); UINTN procAddr = searchProcInDriver(Driver, DriverSize, "initFB");
UINTN verbose = searchProcInDriver(Driver, DriverSize, "gIOFBVerboseBoot"); UINTN verbose = searchProcInDriver(Driver, DriverSize, "gIOFBVerboseBoot");
UINTN patchLoc = FindRelative32(Driver, procAddr, 0x300, verbose-1); if (procAddr != 0) {
if (patchLoc != 0 && Driver[patchLoc + 1] == 0x75) { UINTN patchLoc;
Driver[patchLoc + 1] = 0xEB;
DBG("8 apples patch success\n"); if ((((struct mach_header_64*)KernelData)->filetype) == MH_KERNEL_COLLECTION) {
DBG("procedure in kernel space\n");
patchLoc = FindRelative32(KernelData, procAddr, 0x300, verbose-1);
for (int j = 0; j < 20; ++j) {
DBG("%02X", KernelData[procAddr + j]);
}
DBG("\n");
if (patchLoc != 0 && KernelData[patchLoc + 1] == 0x75) {
KernelData[patchLoc + 1] = 0xEB;
DBG("8 apples patch success\n");
} else {
DBG("8 apples patch not found, loc=0x%llx\n", patchLoc);
}
} else {
DBG("procedure in Driver space\n");
patchLoc = FindRelative32(Driver, procAddr, 0x300, verbose-1);
for (int j = 0; j < 20; ++j) {
DBG("%02X", Driver[patchLoc + j]);
}
DBG("\n");
if (patchLoc != 0 && Driver[patchLoc + 1] == 0x75) {
Driver[patchLoc + 1] = 0xEB;
DBG("8 apples patch success\n");
} else {
DBG("8 apples patch not found, loc=0x%llx\n", patchLoc);
}
}
DBG_RT("AppleRTC: patched\n");
} else { } else {
DBG("8 apples patch not found, loc=0x%llx\n", patchLoc); DBG_RT("AppleRTC: not patched\n");
// if (patchLoc != 0) {
// for (int i=0; i<10; ++i) {
// DBG_RT("%02x", Driver[patchLoc+i]);
// }
// DBG_RT("\n");
// } else if (procAddr != 0) {
// for (int i=0; i<10; ++i) {
// DBG_RT("%02x", Driver[procAddr+i]);
// }
// DBG_RT("\n");
// }
// DBG_RT(" procAddr=0x%llx\n", procAddr);
// DBG_RT(" verbose=0x%llx\n", verbose);
// Stall(20000000);
} }
Stall(5000000); Stall(5000000);
} }