# CVE-2023-35633 — ntoskrnl.exe patch diff

`ntoskrnl.exe` 10.0.22621.2792 -> 10.0.22621.2861 (ghidriff).

## `KiDetectHardwareSpecControlFeatures`  (modified)

```diff
--- KiDetectHardwareSpecControlFeatures
+++ KiDetectHardwareSpecControlFeatures
@@ -1,29 +1,235 @@
 

-/* WARNING: Globals starting with '_' overlap smaller symbols at the same address */

-

-undefined8 KiDetectHardwareSpecControlFeatures(char param_1,ulonglong param_2)

+/* WARNING: Function: __security_check_cookie replaced with injection: security_check_cookie */

+/* WARNING: Removing unreachable block (ram,0x00014038246a) */

+/* WARNING: Removing unreachable block (ram,0x000140382451) */

+/* WARNING: Removing unreachable block (ram,0x0001403823e2) */

+/* WARNING: Removing unreachable block (ram,0x0001403823aa) */

+

+void KiDetectHardwareSpecControlFeatures

+               (longlong param_1,ulonglong param_2,ulonglong *param_3,longlong param_4)

 

 {

-  char *pcVar1;

-  ulonglong uVar2;

-  char cVar3;

-  char *in_RAX;

-  char *unaff_RDI;

-  ulonglong in_R10;

+  char cVar1;

+  byte bVar2;

+  uint *puVar3;

+  ulonglong *puVar4;

+  undefined4 *puVar5;

+  bool bVar6;

+  char cVar7;

+  int iVar8;

+  uint uVar9;

+  ulonglong uVar10;

+  ulonglong uVar11;

+  bool bVar12;

+  bool bVar13;

+  bool bVar14;

+  undefined1 auStack_a8 [32];

+  ulonglong local_88;

+  undefined4 uStack_80;

+  undefined4 uStack_7c;

+  ulonglong local_78;

+  ulonglong *local_70;

+  undefined8 local_68;

+  undefined8 uStack_60;

+  ulonglong local_58 [4];

   

-  cVar3 = (char)in_RAX;

-  *in_RAX = *in_RAX + cVar3;

-  in_RAX[0xfd83] = in_RAX[0xfd83] + param_1;

-  *unaff_RDI = *unaff_RDI + param_1;

-  *in_RAX = *in_RAX + cVar3;

-  in_RAX[0xfa83] = in_RAX[0xfa83] + param_1;

-  pcVar1 = (char *)((longlong)in_RAX * 9 + -0x2f74f28c);

-  *pcVar1 = *pcVar1 + cVar3;

-  wrmsr(0x48,param_2 & 0xffffffff00000000 | (ulonglong)in_RAX & 0xffffffff);

-  if (((in_R10 & KiSpeculationFeatures) != 0) && (KiSsbdMsr != 0x48)) {

-    uVar2 = rdmsr(KiSsbdMsr);

-    wrmsr(KiSsbdMsr,uVar2 | _KiSsbdBit);

-  }

-  return 0;

+  local_58[2] = __security_cookie ^ (ulonglong)auStack_a8;

+  cVar1 = *(char *)(param_1 + 0x8d);

+  uVar10 = 0;

+  uStack_7c = 0;

+  bVar2 = *(byte *)(param_1 + 0x43);

+  local_88 = 0;

+  puVar3 = (uint *)cpuid_basic_info(0);

+  uStack_80 = 0x48;

+  bVar13 = false;

+  local_78 = 4;

+  bVar12 = false;

+  local_68 = (ulonglong)puVar3[1] << 0x20;

+  uStack_60 = CONCAT44(puVar3[2],puVar3[3]);

+  local_58[0] = 0;

+  local_58[1] = 0;

+  if (*puVar3 < 7) {

+    uVar9 = 0;

+  }

+  else {

+    puVar4 = (ulonglong *)cpuid_Extended_Feature_Enumeration_info(7);

+    local_68 = *puVar4;

+    uVar9 = (uint)puVar4[1];

+    uStack_60 = CONCAT44(puVar3[2],*(undefined4 *)((longlong)puVar4 + 0xc));

+    if ((uVar9 >> 0x1d & 1) != 0) {

+      uVar11 = rdmsr(0x10a);

+      bVar12 = (uVar11 & 2) != 0;

+      if (bVar12) {

+        uVar10 = 0x201;

+        local_88 = 0x201;

+      }

+      bVar13 = (uVar11 & 0x10) != 0;

+      if (bVar13) {

+        uVar10 = uVar10 | 0x100;

+        local_88 = uVar10;

+      }

+      bVar13 = bVar13 || bVar12;

+      if ((uVar11 & 4) != 0) {

+        uVar10 = uVar10 | 0x200;

+        bVar13 = true;

+        local_88 = uVar10;

+      }

+    }

+  }

+  if (cVar1 == '\x01') {

+    puVar3 = (uint *)cpuid(0x80000000);

+    uStack_60 = CONCAT44(puVar3[2],puVar3[3]);

+    if (*puVar3 < 0x80000008) {

+      uVar9 = 0;

+    }

+    else {

+      puVar5 = (undefined4 *)cpuid(0x80000008);

+      local_68._0_4_ = *puVar5;

+      uVar9 = puVar5[1];

+      uStack_60 = CONCAT44(puVar5[2],puVar5[3]);

+    }

+    local_68 = CONCAT44(puVar3[1],(undefined4)local_68);

+    if ((uVar9 >> 0xc & 1) != 0) {

+      uVar10 = uVar10 | 4;

+      bVar13 = true;

+      local_88 = uVar10;

+    }

+    if ((uVar9 >> 0xe & 1) != 0) {

+      uVar10 = uVar10 | 0x10;

+      bVar13 = true;

+      local_88 = uVar10;

+    }

+    if ((uVar9 >> 0xf & 1) != 0) {

+      uVar10 = uVar10 | 0x40;

+      bVar13 = true;

+      local_88 = uVar10;

+    }

+    if ((uVar9 >> 0x18 & 1) != 0) {

+      uVar10 = uVar10 | 0x80;

+      local_88 = uVar10;

+    }

+    if ((uVar9 >> 0x1a & 1) != 0) {

+      uVar10 = uVar10 | 0x180;

+      local_88 = uVar10;

+    }

+    if ((local_88 & 0x80) != 0) {

+LAB_0:

+      bVar13 = true;

+    }

+  }

+  else {

+    if ((uVar9 >> 0x1a & 1) != 0) {

+      uVar10 = uVar10 | 0x14;

+      bVar13 = true;

+      local_88 = uVar10;

+    }

+    if ((uVar9 >> 0x1b & 1) != 0) {

+      uVar10 = uVar10 | 0x44;

+      bVar13 = true;

+      local_88 = uVar10;

+    }

+    if ((int)uVar9 < 0) {

+      uVar10 = uVar10 | 0x80;

+      local_88 = uVar10;

+      goto LAB_0;

+    }

+  }

+  if (((param_2 & 1) != 0) || (KiKvaShadowMode == 1)) {

+    uVar10 = uVar10 | 0x20;

+    local_88 = uVar10;

+  }

+  if ((cVar1 == '\x02') && (*(char *)(param_1 + 0x40) == '\x06')) {

+    if ((((byte)(bVar2 - 0x4e) < 0x1a) && ((0x3010081U >> (bVar2 - 0x4e & 0x1f) & 1) != 0)) ||

+       ((bVar2 == 0x8e || (bVar2 == 0x9e)))) {

+      uVar10 = uVar10 | 0x200;

+      local_88 = uVar10;

+    }

+    if (((byte)(bVar2 - 0x37) < 0x3f) &&

+       ((0x4080404800680001U >> ((ulonglong)(byte)(bVar2 - 0x37) & 0x3f) & 1) != 0)) {

+      uVar10 = uVar10 | 0x200;

+      local_88 = uVar10;

+    }

+  }

+  uVar11 = uVar10;

+  local_70 = param_3;

+  if (((local_88 & 0x10) == 0) || ((local_88 & 4) == 0)) goto LAB_1;

+  bVar6 = true;

+  cVar7 = HviIsHypervisorMicrosoftCompatible();

+  if (cVar7 == '\0') {

+    cVar7 = HviIsAnyHypervisorPresent();

+    bVar14 = cVar7 == '\0';

+LAB_2:

+    if (!bVar14) goto LAB_3;

+    bVar6 = false;

+LAB_4:

+    uVar9 = *(uint *)(param_1 + 0x6cc);

+    if ((uVar9 & 2) != 0) {

+      uVar11 = uVar10 | 0x400;

+      local_88 = uVar11;

+    }

+    uVar10 = uVar11;

+    if (((uVar9 & 4) != 0) &&

+       (uVar10 = uVar11 | 0x800, local_88 = uVar10, (KiFeatureSettings & 0x4000) != 0)) {

+      uVar10 = uVar11 | 0x801;

+      local_88 = uVar10;

+    }

+    if (cVar1 == '\x02') {

+      if (((!bVar6) && (!bVar12)) || (uVar11 = uVar10, (uVar9 & 3) != 0)) {

+        uVar11 = uVar10 | 0x1000;

+        local_88 = uVar11;

+      }

+      goto LAB_1;

+    }

+  }

+  else {

+    HviGetEnlightenmentInformation(local_58);

+    local_68 = 0;

+    uStack_60 = 0;

+    HviGetHypervisorFeatures(&local_68);

+    if ((local_68 & 0x100000000000) != 0) {

+      bVar14 = (local_58[0] & 0x1000) == 0;

+      goto LAB_2;

+    }

+LAB_3:

+    if ((KiFeatureSettings & 0x8000) != 0) goto LAB_4;

+  }

+  uVar11 = uVar10;

+  if ((cVar1 == '\x01') && (uVar11 = uVar10 | 0x1000, local_88 = uVar11, (uVar10 & 0x40) != 0)) {

+    uVar11 = uVar10 | 0x5000;

+    local_88 = uVar11;

+  }

+LAB_1:

+  if (((KeFeatureBits2 & 0x20000) != 0) && ((KiFeatureSettings & 0x400000) == 0)) {

+    uVar11 = uVar11 | 0x2000;

+    local_88 = uVar11;

+  }

+  iVar8 = KiIsBranchConfusionPresent(param_1);

+  if (iVar8 != 0) {

+    uVar11 = uVar11 | 0x8000;

+    local_88 = uVar11;

+  }

+  if ((cVar1 != '\x01') || ((KeFeatureBits2 & 0x2000000) != 0)) {

+    uVar11 = uVar11 | 8;

+    local_88 = uVar11;

+  }

+  if ((KiFeatureSettings & 0x10000) != 0) {

+    uVar11 = uVar11 & 0xfffffffffffff7fe;

+    local_88 = uVar11;

+  }

+  iVar8 = KiIsSrsoPresent(param_1);

+  if (iVar8 != 0) {

+    uVar11 = uVar11 | 0x200000;

+    local_88 = uVar11;

+  }

+  if (cVar1 == '\x01') {

+    local_88 = uVar11 | 0x400000;

+  }

+  *local_70 = local_88;

+  local_70[1] = CONCAT44(uStack_7c,uStack_80);

+  local_70[2] = local_78;

+  if (param_4 != 0) {

+    *(bool *)param_4 = bVar13;

+  }

+  return;

 }
```
