From ffcdc0e4c583f0a02407102ece7ac75e6ebe6bd9 Mon Sep 17 00:00:00 2001
From: vit9696 <vit9696@users.noreply.github.com>
Date: Thu, 20 Feb 2020 09:40:53 +0300
Subject: [PATCH] OcAppleKernelLib: Update GS layout for LAPIC patch on 10.15.4

---
 Library/OcAppleKernelLib/CommonPatches.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Library/OcAppleKernelLib/CommonPatches.c b/Library/OcAppleKernelLib/CommonPatches.c
index befab8b9..78382b87 100644
--- a/Library/OcAppleKernelLib/CommonPatches.c
+++ b/Library/OcAppleKernelLib/CommonPatches.c
@@ -1335,15 +1335,15 @@ PatchPanicKextDump (
 STATIC
 UINT8
 mLapicKernelPanicPatchFind[] = {
-  // mov eax, gs:1Ch
+  // mov eax, gs:1Ch or gs:18h on 10.15.4+.
   // cmp eax, cs:_master_cpu <- address masked out
-  0x65, 0x8B, 0x04, 0x25, 0x1C, 0x00, 0x00, 0x00, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00
+  0x65, 0x8B, 0x04, 0x25, 0x18, 0x00, 0x00, 0x00, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
 STATIC
 UINT8
 mLapicKernelPanicPatchMask[] = {
-  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00
+  0xFF, 0xFF, 0xFF, 0xFF, 0xFB, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
 STATIC