# CVE-2019-1468 — win32k.sys patch diff

`win32k.sys` 10.0.18362.476 -> 10.0.18362.535 (ghidriff).

## `ApiSetpResolveHost`  (modified)

```diff
--- ApiSetpResolveHost
+++ ApiSetpResolveHost
@@ -1,17 +1,95 @@
 

 undefined8

 ApiSetpResolveHost(longlong param_1,ulonglong *param_2,undefined8 param_3,undefined8 param_4,

                   undefined8 param_5,undefined1 *param_6,short *param_7)

 

 {

-  byte *pbVar1;

-  undefined1 in_AL;

-  undefined7 in_register_00000001;

-  byte *unaff_RBX;

+  byte bVar1;

+  short sVar2;

+  bool bVar3;

+  ushort uVar4;

+  ulonglong uVar5;

+  longlong lVar6;

+  undefined1 uVar7;

+  ushort uVar8;

+  longlong local_38;

+  undefined8 uStack_30;

+  int iStack_2c;

+  undefined8 local_28;

+  undefined8 uStack_20;

+  undefined8 local_18;

   

-  *unaff_RBX = *unaff_RBX ^ (byte)((ulonglong)param_2 >> 8);

-  pbVar1 = (byte *)(CONCAT71(in_register_00000001,in_AL) + -0x75);

-  *pbVar1 = *pbVar1 >> 4 | *pbVar1 << 4;

-  return CONCAT71(in_register_00000001,in_AL) & 0xffffffffffffff38;

+  local_38 = 0;

+  uStack_30 = 0;

+  uVar7 = 0;

+  local_28 = 0;

+  uStack_20 = 0;

+  local_18 = 0;

+  param_7[0] = 0;

+  param_7[1] = 0;

+  param_7[2] = 0;

+  param_7[3] = 0;

+  param_7[4] = 0;

+  param_7[5] = 0;

+  param_7[6] = 0;

+  param_7[7] = 0;

+  uVar5 = ApiSetpGetContractKeyInfo(param_2,(ushort)param_3,param_3,&local_38);

+  if ((char)uVar5 == '\0') goto LAB_0;

+  if (iStack_2c == 1) {

+    uVar4 = ApiSetpSearchForSectionIndex_V7(param_1,(uint *)(param_1 + 0x2c),&local_38,'\x01');

+    if (uVar4 == 0xffff) goto LAB_0;

+    uVar8 = *(ushort *)(param_1 + 0x12);

+    lVar6 = (ulonglong)*(uint *)(param_1 + 0x2c) +

+            ((ulonglong)uVar4 * (ulonglong)*(byte *)(param_1 + 0x34) - (ulonglong)uVar8) + param_1;

+    bVar1 = *(byte *)(lVar6 + 10);

+    uVar4 = *(ushort *)(lVar6 + 4);

+  }

+  else if (iStack_2c == 2) {

+    uVar7 = 1;

+    uVar4 = ApiSetpSearchForSectionIndex_V7(param_1,(uint *)(param_1 + 0x38),&local_38,'\0');

+    if (uVar4 == 0xffff) goto LAB_0;

+    lVar6 = (ulonglong)*(uint *)(param_1 + 0x38) +

+            param_1 + ((ulonglong)*(byte *)(param_1 + 0x40) * (ulonglong)uVar4 -

+                      (ulonglong)*(ushort *)(param_1 + 0x12));

+    if (((*(byte *)(lVar6 + 6) & 4) != 0) &&

+       (((*(byte *)(lVar6 + 6) & 2) != 0 ||

+        ((*(int *)(lVar6 + 8) != 0 && (bVar3 = ApiSetpIsFeatureEnabled(*(int *)(lVar6 + 8)), !bVar3)

+         ))))) goto LAB_0;

+    uVar8 = *(ushort *)(param_1 + 0x12);

+    lVar6 = ((ulonglong)*(ushort *)(lVar6 + 4) * (ulonglong)*(byte *)(param_1 + 0x34) +

+            (ulonglong)*(uint *)(param_1 + 0x2c)) - (ulonglong)uVar8;

+    bVar1 = *(byte *)(lVar6 + 10 + param_1);

+    uVar4 = *(ushort *)(lVar6 + 4 + param_1);

+  }

+  else {

+    if ((iStack_2c != 3) ||

+       (uVar4 = ApiSetpSearchForSectionIndex_V7(param_1,(uint *)(param_1 + 0x44),&local_38,'\0'),

+       uVar4 == 0xffff)) goto LAB_0;

+    uVar8 = *(ushort *)(param_1 + 0x12);

+    lVar6 = (ulonglong)*(uint *)(param_1 + 0x44) +

+            ((ulonglong)uVar4 * (ulonglong)*(byte *)(param_1 + 0x4c) - (ulonglong)uVar8) + param_1;

+    if (((*(byte *)(lVar6 + 10) & 4) != 0) && (*(byte *)(lVar6 + 9) < (ushort)uStack_20))

+    goto LAB_0;

+    lVar6 = ((ulonglong)*(ushort *)(lVar6 + 4) * (ulonglong)*(byte *)(param_1 + 0x34) +

+            (ulonglong)*(uint *)(param_1 + 0x2c)) - (ulonglong)uVar8;

+    bVar1 = *(byte *)(lVar6 + 10 + param_1);

+    uVar4 = *(ushort *)(lVar6 + 4 + param_1);

+  }

+  uVar7 = 1;

+  if ((bVar1 >> 1 & 1) != 0) {

+    lVar6 = ((ulonglong)*(byte *)(param_1 + 100) * (ulonglong)uVar4 +

+            (ulonglong)*(uint *)(param_1 + 0x5c)) - (ulonglong)uVar8;

+    if (*(byte *)(lVar6 + 10 + param_1) <= *(byte *)(param_1 + 3)) {

+      *(ulonglong *)(param_7 + 4) =

+           (((ulonglong)*(uint *)(lVar6 + 4 + param_1) + (ulonglong)*(uint *)(param_1 + 0x24)) -

+           (ulonglong)uVar8) + param_1;

+      sVar2 = *(short *)(lVar6 + 8 + param_1) * 2;

+      *param_7 = sVar2;

+      param_7[1] = sVar2;

+    }

+  }

+LAB_0:

+  *param_6 = uVar7;

+  return 0;

 }
```

## `NtUserWin32kSysCallFilterStub`  (modified)

```diff
--- NtUserWin32kSysCallFilterStub
+++ ApiSetpIsFeatureEnabled
@@ -1,17 +1,33 @@
 

-/* WARNING: Function: _guard_dispatch_icall replaced with injection: guard_dispatch_icall */

-

-void NtUserWin32kSysCallFilterStub(undefined8 param_1,undefined4 param_2)

+bool ApiSetpIsFeatureEnabled(int param_1)

 

 {

-  code *pcVar1;

-  longlong lVar2;

+  char cVar1;

+  int iVar2;

+  ulonglong uVar3;

   

-  lVar2 = W32GetSessionState();

-  pcVar1 = *(code **)(*(longlong *)(*(longlong *)(lVar2 + 0x88) + 0x18) + 0x18);

-  if (pcVar1 != (code *)0x0) {

-    (*pcVar1)(param_1,param_2);

+  if (param_1 == 0x3a132a5) {

+    uVar3 = Feature_DriverSetup_ReofferFingerprinting_v2__private_IsEnabledDeviceUsageNoInline();

+    iVar2 = (int)uVar3;

   }

-  return;

+  else if (param_1 == 0x3a52a68) {

+    uVar3 = Feature_ProjectTessera_CreateProcessInSandbox__private_IsEnabledDeviceUsageNoInline();

+    iVar2 = (int)uVar3;

+  }

+  else if (param_1 == 0x3b76c1d) {

+    uVar3 = Feature_LearningModeTraceService__private_IsEnabledDeviceUsageNoInline();

+    iVar2 = (int)uVar3;

+  }

+  else {

+    if (param_1 != 0x3ce6c27) {

+      cVar1 = '\0';

+      goto LAB_0;

+    }

+    uVar3 = Feature_LearningModeTraceServiceWithOptions__private_IsEnabledDeviceUsageNoInline();

+    iVar2 = (int)uVar3;

+  }

+  cVar1 = (iVar2 != 0) + '\x01';

+LAB_0:

+  return cVar1 == '\x02';

 }
```

## `ApiSetpSearchForSectionIndex_V7`  (modified)

```diff
--- ApiSetpSearchForSectionIndex_V7
+++ ApiSetpSearchForSectionIndex_V7
@@ -1,25 +1,21 @@
 

 ushort ApiSetpSearchForSectionIndex_V7

                  (longlong param_1,uint *param_2,longlong *param_3,char param_4)

 

 {

-  uint uVar1;

-  uint unaff_EBX;

-  uint unaff_EDI;

-  bool in_ZF;

-  uint *in_stack_00000058;

-  uint *in_stack_00000060;

+  ulonglong uVar1;

+  ushort local_18 [2];

+  uint local_14;

+  uint local_10 [2];

   

-  uVar1 = unaff_EDI & 0xff;

-  if (in_ZF) {

-    uVar1 = unaff_EDI;

+  local_10[0] = 0;

+  local_14 = 0;

+  ApiSetpGetSearchKeyHashPair(param_1,(longlong)param_2,param_3,param_4,local_10,&local_14);

+  local_18[0] = 0;

+  uVar1 = ApiSetpFindHashtableIndexAndVerify_V7(param_1,param_2,local_10[0],local_14,local_18);

+  if ((char)uVar1 == '\0') {

+    local_18[0] = 0xffff;

   }

-  *in_stack_00000058 = uVar1;

-  uVar1 = unaff_EBX & 0xff;

-  if (in_ZF) {

-    uVar1 = unaff_EBX;

-  }

-  *in_stack_00000060 = uVar1;

-  return (ushort)in_stack_00000060;

+  return local_18[0];

 }
```

## `NTOSKRNL.EXE::PsIsWin32KFilterEnabled`  (modified)

```diff
--- NTOSKRNL.EXE::PsIsWin32KFilterEnabled calling
+++ NTOSKRNL.EXE::PsIsWin32KFilterEnabled calling
@@ -81,0 +82 @@
+_stub_DxgkGetContextQos
@@ -93,0 +95 @@
+_stub_DxgkSetContextQosOverride
@@ -894,0 +897 @@
+_stub_UserDwmGetThreadDesktopID
```
