OcAppleKernelLib: Fix kext blocker exclude under 32-bit

acidanthera · Jun 17, 2023 · c173a26 · c173a26
1 parent b3d7e9f
commit c173a26
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,8 @@
 OpenCore Changelog
 ==================
+#### v0.9.4
+- Fixed kext blocker `Exclude` strategy for prelinked on 32-bit versions of macOS
+
 #### v0.9.3
 - Added `--force-codec` option to AudioDxe, thx @xCuri0
 - Downgraded additional warning message in normal operation of emulated NVRAM to info

diff --git a/Library/OcAppleKernelLib/KextPatcher.c b/Library/OcAppleKernelLib/KextPatcher.c
@@ -403,6 +403,7 @@ PatcherExcludePrelinkedKext (
   VOID                      *KextData;
   UINT64                    AddressMax;
   UINT64                    VirtualAddress;
+  UINT64                    FileOffset;
   UINT64                    Size;
   UINT64                    MaxSize;
 
@@ -437,12 +438,24 @@ PatcherExcludePrelinkedKext (
 
   MaxSize = AddressMax - PatcherContext->VirtualBase;
 
+  //
+  // Get file offset for 32-bit.
+  //
+  if (PatcherContext->Is32Bit) {
+    if (!GetTextBaseOffset(&PatcherContext->MachContext, &VirtualAddress, &FileOffset)) {
+      return EFI_UNSUPPORTED;
+    }
+    VirtualAddress += FileOffset;
+  } else {
+    VirtualAddress = PatcherContext->VirtualBase;
+  }
+
   //
   // Zero out kext memory through PatcherContext->MachContext.
   //
   KextData = MachoGetFilePointerByAddress (
                &PatcherContext->MachContext,
-               PatcherContext->VirtualBase,
+               VirtualAddress,
                NULL
                );
   if (KextData == NULL) {