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

Load kext depending on version and boot mode.

Browse Source
This commit is contained in:
jief 2019-12-09 11:22:15 +01:00
parent bbfdd287be
commit 0946f0d1e8
4 changed files with 114 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rEFIt_UEFI/Platform/Platform.h
View File

@ -860,7 +860,7 @@ struct SIDELOAD_KEXT {
SIDELOAD_KEXT *Next; SIDELOAD_KEXT *Next;
SIDELOAD_KEXT *PlugInList; SIDELOAD_KEXT *PlugInList;
CHAR16 *FileName; CHAR16 *FileName;
CHAR16 *MatchOS; CHAR16 *KextDirNameUnderOEMPath;
CHAR16 *Version; CHAR16 *Version;
INPUT_ITEM MenuItem; INPUT_ITEM MenuItem;
}; };

10
rEFIt_UEFI/Platform/Settings.c
View File

@ -3463,7 +3463,7 @@ CHAR16* GetBundleVersion(CHAR16 *FullName)
return CFBundleVersion; return CFBundleVersion;
} }
VOID GetListOfInjectKext(CHAR16 *KextPath) VOID GetListOfInjectKext(CHAR16 *KextDirNameUnderOEMPath)
{ {
REFIT_DIR_ITER DirIter; REFIT_DIR_ITER DirIter;
@ -3471,13 +3471,13 @@ VOID GetListOfInjectKext(CHAR16 *KextPath)
SIDELOAD_KEXT* mKext; SIDELOAD_KEXT* mKext;
SIDELOAD_KEXT* mPlugInKext; SIDELOAD_KEXT* mPlugInKext;
CHAR16* FullName; CHAR16* FullName;
CHAR16* FullPath = PoolPrint(L"%s\\KEXTS\\%s", OEMPath, KextPath); CHAR16* FullPath = PoolPrint(L"%s\\KEXTS\\%s", OEMPath, KextDirNameUnderOEMPath);
REFIT_DIR_ITER PlugInsIter; REFIT_DIR_ITER PlugInsIter;
EFI_FILE_INFO *PlugInEntry; EFI_FILE_INFO *PlugInEntry;
CHAR16* PlugInsPath; CHAR16* PlugInsPath;
CHAR16* PlugInsName; CHAR16* PlugInsName;
BOOLEAN Blocked = FALSE; BOOLEAN Blocked = FALSE;
if (StrCmp(KextPath, L"Off") == 0) { if (StrCmp(KextDirNameUnderOEMPath, L"Off") == 0) {
Blocked = TRUE; Blocked = TRUE;
} }
@ -3495,7 +3495,7 @@ VOID GetListOfInjectKext(CHAR16 *KextPath)
mKext = AllocateZeroPool (sizeof(SIDELOAD_KEXT)); mKext = AllocateZeroPool (sizeof(SIDELOAD_KEXT));
mKext->FileName = PoolPrint(L"%s", DirEntry->FileName); mKext->FileName = PoolPrint(L"%s", DirEntry->FileName);
mKext->MenuItem.BValue = Blocked; mKext->MenuItem.BValue = Blocked;
mKext->MatchOS = PoolPrint(L"%s", KextPath); mKext->KextDirNameUnderOEMPath = PoolPrint(L"%s", KextDirNameUnderOEMPath);
mKext->Next = InjectKextList; mKext->Next = InjectKextList;
mKext->Version = GetBundleVersion(FullName); mKext->Version = GetBundleVersion(FullName);
InjectKextList = mKext; InjectKextList = mKext;
@ -3514,7 +3514,7 @@ VOID GetListOfInjectKext(CHAR16 *KextPath)
mPlugInKext = AllocateZeroPool(sizeof(SIDELOAD_KEXT)); mPlugInKext = AllocateZeroPool(sizeof(SIDELOAD_KEXT));
mPlugInKext->FileName = PoolPrint(L"%s", PlugInEntry->FileName); mPlugInKext->FileName = PoolPrint(L"%s", PlugInEntry->FileName);
mPlugInKext->MenuItem.BValue = Blocked; mPlugInKext->MenuItem.BValue = Blocked;
mPlugInKext->MatchOS = PoolPrint(L"%s", KextPath); mPlugInKext->KextDirNameUnderOEMPath = PoolPrint(L"%s", KextDirNameUnderOEMPath);
mPlugInKext->Next = mKext->PlugInList; mPlugInKext->Next = mKext->PlugInList;
mPlugInKext->Version = GetBundleVersion(PlugInsName); mPlugInKext->Version = GetBundleVersion(PlugInsName);
mKext->PlugInList = mPlugInKext; mKext->PlugInList = mPlugInKext;

136
rEFIt_UEFI/Platform/kext_inject.c
View File

@ -1,6 +1,6 @@
#include "Platform.h" #include "Platform.h"
#define KEXT_INJECT_DEBUG 0 #define KEXT_INJECT_DEBUG 2
#if KEXT_INJECT_DEBUG == 2 #if KEXT_INJECT_DEBUG == 2
#define DBG(...) MsgLog(__VA_ARGS__) #define DBG(...) MsgLog(__VA_ARGS__)
@ -99,20 +99,20 @@ BOOLEAN checkOSBundleRequired(UINT8 loaderType, TagPtr dict)
else else
osbundlerequired[0] = '\0'; osbundlerequired[0] = '\0';
if (OSTYPE_IS_OSX_RECOVERY(loaderType)) { // if (OSTYPE_IS_OSX_RECOVERY(loaderType)) {
if (AsciiStrnCmp(osbundlerequired, "root", 4) && // if (AsciiStrnCmp(osbundlerequired, "root", 4) &&
AsciiStrnCmp(osbundlerequired, "local", 5) && // AsciiStrnCmp(osbundlerequired, "local", 5) &&
AsciiStrnCmp(osbundlerequired, "console", 7) && // AsciiStrnCmp(osbundlerequired, "console", 7) &&
AsciiStrnCmp(osbundlerequired, "network-root", 12)) { // AsciiStrnCmp(osbundlerequired, "network-root", 12)) {
inject = FALSE; // inject = FALSE;
} // }
} else if (OSTYPE_IS_OSX_INSTALLER(loaderType)) { // } else if (OSTYPE_IS_OSX_INSTALLER(loaderType)) {
if (AsciiStrnCmp(osbundlerequired, "root", 4) && // if (AsciiStrnCmp(osbundlerequired, "root", 4) &&
AsciiStrnCmp(osbundlerequired, "local", 5) && // AsciiStrnCmp(osbundlerequired, "local", 5) &&
AsciiStrnCmp(osbundlerequired, "console", 7)) { // AsciiStrnCmp(osbundlerequired, "console", 7)) {
inject = FALSE; // inject = FALSE;
} // }
} // }
return inject; return inject;
} }
@ -277,7 +277,7 @@ VOID LoadPlugInKexts(IN LOADER_ENTRY *Entry, IN EFI_FILE *RootDir, IN CHAR16 *Di
DirIterClose(&PlugInIter); DirIterClose(&PlugInIter);
} }
VOID AddKexts(IN LOADER_ENTRY *Entry, CHAR16 *SrcDir, CHAR16 *Path, CHAR16 *UniSysVers, cpu_type_t archCpuType) VOID AddKexts(IN LOADER_ENTRY *Entry, CHAR16 *SrcDir, CHAR16 *Path/*, CHAR16 *UniSysVers*/, cpu_type_t archCpuType)
{ {
CHAR16 FileName[256]; CHAR16 FileName[256];
CHAR16 PlugInName[256]; CHAR16 PlugInName[256];
@ -288,8 +288,8 @@ VOID AddKexts(IN LOADER_ENTRY *Entry, CHAR16 *SrcDir, CHAR16 *Path, CHAR16 *UniS
MsgLog("Preparing kexts injection for arch=%s from %s\n", (archCpuType==CPU_TYPE_X86_64)?L"x86_64":(archCpuType==CPU_TYPE_I386)?L"i386":L"", SrcDir); MsgLog("Preparing kexts injection for arch=%s from %s\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 %s Match %s, while sysver: %s\n", CurrentKext->FileName, CurrentKext->MatchOS, UniSysVers); DBG("current kext name=%s path=%s, match against=%s\n", CurrentKext->FileName, CurrentKext->KextDirNameUnderOEMPath, Path);
if (StrStr(CurrentKext->MatchOS, Path) != NULL) { if (StrCmp(CurrentKext->KextDirNameUnderOEMPath, Path) == 0) {
UnicodeSPrint(FileName, 512, L"%s\\%s", SrcDir, CurrentKext->FileName); UnicodeSPrint(FileName, 512, L"%s\\%s", SrcDir, CurrentKext->FileName);
if (!(CurrentKext->MenuItem.BValue)) { if (!(CurrentKext->MenuItem.BValue)) {
// inject require // inject require
@ -319,6 +319,21 @@ VOID AddKexts(IN LOADER_ENTRY *Entry, CHAR16 *SrcDir, CHAR16 *Path, CHAR16 *UniS
} // end of kext injection } // end of kext injection
} }
//
//CHAR16* tryKextDir(CHAR16* FormatString, ...)
//{
// VA_LIST Marker;
// CHAR16 Dir[1024];
//
// // Make sure the buffer is intact for writing
// if (FormatString == NULL) return NULL;
//
// // Print message to log buffer
// VA_START(Marker, FormatString);
// UnicodeVSPrint(Dir, sizeof(Dir), FormatString, Marker);
// VA_END(Marker);
//
//}
EFI_STATUS LoadKexts(IN LOADER_ENTRY *Entry) EFI_STATUS LoadKexts(IN LOADER_ENTRY *Entry)
{ {
@ -397,33 +412,96 @@ EFI_STATUS LoadKexts(IN LOADER_ENTRY *Entry)
} }
} }
CHAR16 UniSysVers[6]; CHAR16 UniOSVersion[16];
AsciiStrToUnicodeStrS(Entry->OSVersion, UniOSVersion, 16);
DBG("UniOSVersion == %s\n", UniOSVersion);
CHAR16 UniShortOSVersion[6];
CHAR8 ShortOSVersion[6]; CHAR8 ShortOSVersion[6];
if (AsciiOSVersionToUint64(Entry->OSVersion) < AsciiOSVersionToUint64("10.10")) { if (AsciiOSVersionToUint64(Entry->OSVersion) < AsciiOSVersionToUint64("10.10")) {
// OSVersion that are earlier than 10.10(form: 10.x.y) // OSVersion that are earlier than 10.10(form: 10.x.y)
AsciiStrnCpyS(ShortOSVersion, 6, Entry->OSVersion, 4); AsciiStrnCpyS(ShortOSVersion, 6, Entry->OSVersion, 4);
AsciiStrToUnicodeStrS(Entry->OSVersion, UniSysVers, 5); AsciiStrToUnicodeStrS(Entry->OSVersion, UniShortOSVersion, 5);
} else { } else {
AsciiStrnCpyS(ShortOSVersion, 6, Entry->OSVersion, 5); AsciiStrnCpyS(ShortOSVersion, 6, Entry->OSVersion, 5);
AsciiStrToUnicodeStrS(Entry->OSVersion, UniSysVers, 6); AsciiStrToUnicodeStrS(Entry->OSVersion, UniShortOSVersion, 6);
} }
DBG("ShortOSVersion == %a\n", ShortOSVersion);
DBG("UniShortOSVersion == %s\n", UniShortOSVersion);
// syscl - allow specific load inject kext // syscl - allow specific load inject kext
// Clover/Kexts/Other is for general injection thus we need to scan both Other and OSVersion folder // Clover/Kexts/Other is for general injection thus we need to scan both Other and OSVersion folder
if ((SrcDir = GetOtherKextsDir(TRUE)) != NULL) { if ((SrcDir = GetOtherKextsDir(TRUE)) != NULL) {
AddKexts(Entry, SrcDir, L"Other", UniSysVers, archCpuType); AddKexts(Entry, SrcDir, L"Other", archCpuType);
FreePool(SrcDir); FreePool(SrcDir);
}else{
DBG("GetOtherKextsDir(TRUE) return NULL\n");
} }
// slice: CLOVER/kexts/Off keep disabled kext which can be allowed // slice: CLOVER/kexts/Off keep disabled kext which can be allowed
if ((SrcDir = GetOtherKextsDir(FALSE)) != NULL) { if ((SrcDir = GetOtherKextsDir(FALSE)) != NULL) {
AddKexts(Entry, SrcDir, L"Off", UniSysVers, archCpuType); AddKexts(Entry, SrcDir, L"Off", archCpuType);
FreePool(SrcDir); FreePool(SrcDir);
}else{
DBG("GetOtherKextsDir(FALSE) return NULL\n");
} }
if ((SrcDir = GetOSVersionKextsDir(ShortOSVersion)) != NULL) { CHAR16* OSShortVersionKextsDir;
AddKexts(Entry, SrcDir, UniSysVers, UniSysVers, archCpuType); if ((OSShortVersionKextsDir = GetOSVersionKextsDir(ShortOSVersion)) != NULL)
FreePool(SrcDir); {
} AddKexts(Entry, OSShortVersionKextsDir, UniShortOSVersion, archCpuType);
{
CHAR16 DirName[256];
if (OSTYPE_IS_OSX_INSTALLER(Entry->LoaderType)) {
UnicodeSPrint(DirName, sizeof(DirName), L"%a_install", ShortOSVersion);
} else {
if (OSTYPE_IS_OSX_RECOVERY(Entry->LoaderType)) {
UnicodeSPrint(DirName, sizeof(DirName), L"%a_recovery", ShortOSVersion);
}else{
UnicodeSPrint(DirName, sizeof(DirName), L"%a_normal", ShortOSVersion);
}
}
CHAR16 SrcDir2[1024];
UnicodeSPrint(SrcDir2, sizeof(SrcDir2), L"%s\\..\\%s", OSShortVersionKextsDir, DirName);
AddKexts(Entry, SrcDir2, DirName, archCpuType);
// jief: Load kext also from long version folder.
{
CHAR16 OSVersionKextsDirName[256];
if ( StrCmp(UniOSVersion, UniShortOSVersion) != 0 ) {
UnicodeSPrint(OSVersionKextsDirName, sizeof(OSVersionKextsDirName), L"%a", Entry->OSVersion);
}else{
DBG("UniOSVersion == UniShortOSVersion, '%s'\n", UniShortOSVersion);
UnicodeSPrint(OSVersionKextsDirName, sizeof(OSVersionKextsDirName), L"%a.0", Entry->OSVersion);
}
{
CHAR16 OSVersionKextsDir[1024];
UnicodeSPrint(OSVersionKextsDir, sizeof(OSVersionKextsDir), L"%s\\..\\%s", OSShortVersionKextsDir, OSVersionKextsDirName);
AddKexts(Entry, OSVersionKextsDir, OSVersionKextsDirName, archCpuType);
}
CHAR16 DirName[256];
if ( OSTYPE_IS_OSX_INSTALLER(Entry->LoaderType)) {
UnicodeSPrint(DirName, sizeof(DirName), L"%s_install", OSVersionKextsDirName);
}else{
if (OSTYPE_IS_OSX_RECOVERY(Entry->LoaderType)) {
UnicodeSPrint(DirName, sizeof(DirName), L"%s_recovery", OSVersionKextsDirName);
}else{
UnicodeSPrint(DirName, sizeof(DirName), L"%s_normal", OSVersionKextsDirName);
}
}
CHAR16 SrcDir2[1024];
UnicodeSPrint(SrcDir2, sizeof(SrcDir2), L"%s\\..\\%s", OSShortVersionKextsDir, DirName);
AddKexts(Entry, SrcDir2, DirName, archCpuType);
}
}
FreePool(OSShortVersionKextsDir);
}else{
DBG("GetOSVersionKextsDir(%a) return NULL", ShortOSVersion);
}
// reserve space in the device tree // reserve space in the device tree
if (GetKextCount() > 0) { if (GetKextCount() > 0) {
@ -449,13 +527,13 @@ EFI_STATUS LoadKexts(IN LOADER_ENTRY *Entry)
while (CurrentPlugInKext) { while (CurrentPlugInKext) {
Next = CurrentPlugInKext->Next; Next = CurrentPlugInKext->Next;
FreePool(CurrentPlugInKext->FileName); FreePool(CurrentPlugInKext->FileName);
FreePool(CurrentPlugInKext->MatchOS); FreePool(CurrentPlugInKext->KextDirNameUnderOEMPath);
FreePool(CurrentPlugInKext->Version); FreePool(CurrentPlugInKext->Version);
FreePool(CurrentPlugInKext); FreePool(CurrentPlugInKext);
CurrentPlugInKext = Next; CurrentPlugInKext = Next;
} }
FreePool(InjectKextList->FileName); FreePool(InjectKextList->FileName);
FreePool(InjectKextList->MatchOS); FreePool(InjectKextList->KextDirNameUnderOEMPath);
FreePool(InjectKextList->Version); FreePool(InjectKextList->Version);
FreePool(InjectKextList); FreePool(InjectKextList);
InjectKextList = CurrentKext; InjectKextList = CurrentKext;

2
rEFIt_UEFI/refit/menu.c
View File

@ -4631,7 +4631,7 @@ REFIT_MENU_ENTRY *SubMenuKextBlockInjection(CHAR16* UniSysVer)
NewEntry(&Entry, &SubScreen, ActionEnter, SCREEN_KEXT_INJECT, sysVer); NewEntry(&Entry, &SubScreen, ActionEnter, SCREEN_KEXT_INJECT, sysVer);
AddMenuInfoLine(SubScreen, PoolPrint(L"Choose/check kext to disable:")); AddMenuInfoLine(SubScreen, PoolPrint(L"Choose/check kext to disable:"));
while (Kext) { while (Kext) {
if (StrStr(Kext->MatchOS, UniSysVer) != NULL) { if (StrStr(Kext->KextDirNameUnderOEMPath, UniSysVer) != NULL) {
InputBootArgs = AllocateZeroPool(sizeof(REFIT_INPUT_DIALOG)); InputBootArgs = AllocateZeroPool(sizeof(REFIT_INPUT_DIALOG));
InputBootArgs->Entry.Title = PoolPrint(L"%s, v.%s", Kext->FileName, Kext->Version); InputBootArgs->Entry.Title = PoolPrint(L"%s, v.%s", Kext->FileName, Kext->Version);
InputBootArgs->Entry.Tag = TAG_INPUT; InputBootArgs->Entry.Tag = TAG_INPUT;