From 618bcc3e64d5b2829f923dd806c4fc654ff28c4c Mon Sep 17 00:00:00 2001
From: hfiref0x <hfiref0x@users.noreply.github.com>
Date: Fri, 18 Nov 2022 06:26:27 +0700
Subject: [PATCH] v 1.2.7

Readme update
Bin removed
---
 Bin/dummy.sys                   | Bin 4608 -> 0 bytes
 Bin/dummy2.sys                  | Bin 6656 -> 0 bytes
 Bin/license.txt                 |  21 ----
 KDU.sha256                      |   7 +-
 README.md                       |  11 +-
 Source/Hamakaze/idrv/dbutil.cpp |   4 +-
 Source/Hamakaze/wdksup.h        | 193 +++++++++++++++++++++++++++++++-
 7 files changed, 206 insertions(+), 30 deletions(-)
 delete mode 100644 Bin/dummy.sys
 delete mode 100644 Bin/dummy2.sys
 delete mode 100644 Bin/license.txt

diff --git a/Bin/dummy.sys b/Bin/dummy.sys
deleted file mode 100644
index 5bb51f09bb0a1b9111b46dda0ad396cf4358d06f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4608
zcmeHKZ)jUp6hDb3c3uAot1`9pwkD%R7t_p2DN|l-qAxCU&!(#~E#}`_8<xDpmzUYW
z&_ahZgo2+$LAo&fESn6e9jN#R`k_@nsQAr(v^t?5)iIyv+;?C5+R=hchLs*T@0|NP
zf9|;__ubrg^u$|m2LRlOY?=UbD2XKg-2SnQ=9bR+7Pzu!scX&^U+Nl}$dy@1FOKV}
z0?VW{t!S{c%JhoHavF;qORz#Qs|K2z8+{`6r-#2=x;{2PYjeH->V@C=`0DImDC_+n
zU-*;DPdI*{_d`BD&^yQFa4s`Jv0GKDL;<pIc;WKO>7?zm3f-{R-O>SGL>dIDplsv1
z<RU@38=w(|%>+XU8JpGdK7b37VLM2~qR~oX3kneksgNHA=;4}pNB}|SI0>*1#|i^@
zz=?0tOK5N4g$e_XH{{vmA28HO12I40R1mI>|L8Op!~iA&dNyUG0IpDO1h^md$w3l;
z9I)K1wb8_s&+eu0MZbkW$#UeiA;A5pp$?KTU+me~2tg8UMg^HRWD~N37(hCptNCKa
z>JcQ-Nb}Nq93%le=@{;++jQV_fW@2X<jK~~b3DpiM(Z~5yQZDpfgkWZBDyA|J7JCQ
z6LLY|7K+a{;O8R~lHNVkt#?*9*=KFbTF|<(;mlfxZ(R#ob!|=*WEMUkq$DIAGn}Gy
z(A|D=d)?sG-AZ?d7dnh4xI4QSJdfhRh-cq^<jF3;e<?S(@4<g52lj7Q8@l+@!FM0J
z{p;VI@xRdldUyTEmvFy1_ZjWM733+zNj~u$z<cDgOaH45NXO;rYf_|@eI-rZaJQcC
z#sg-a4oA8Al24ImJoh6YR}J3_@tNjFxPI1`jL&!uaXsQ=GtZ>W_V2$jO?3XiG))m5
z@%3QD4a!vWyp3jz>7<xigItY^uvx^-_9=X-a_zAHO>SQ`+h3z}wI9v)0x8wAz5&d2
z8FTUESXq!t!U;T07*e&XIL5=UKDmYk%Qakq)cVnqbnZ99KfU5I?w$U_W$eK^pTekL
z_oH%<lr~iMk#ZL**X>zkN{iDDB7hS;hz@+IzkF?)hdz_1zm&$lSX@k`3>GfwtS`ty
zeS`gv4TkzyC>ZLqZ&eXJcUsk>nxUWJ(2M@^7_&f@uH^Ct!vy|vbE630_QaX8p%$2)
z(#BO*Hd4C5@Vm-idYEPK^NAHwrIMQEfu*%Taf##cLls?DHG?U7F{75tY>@f$71rY~
z^)lNuGNG%ftivJ_Dd9vSHX4079vzLwv8J#xw5HP(kyt_rj||B+cw9TB6<^iZXewV(
z(Vx$MM15K{#7r^$mHgw@0^f1mB|>z+V8~n0KfRZnfJk~=(Q}#+odkH^bF^SJahQ6T
zpcVpr>y8!I3lq(O*S$*lCN!3X^BZuhUkHO{6w9Y{Egw)P)h&wONieg%rGoW=`a*rV
R{&Rh`zLUz|t@YMA@HfHhtJDAh

diff --git a/Bin/dummy2.sys b/Bin/dummy2.sys
deleted file mode 100644
index 6dbfdb856d87dbd0addddd56354e279a3833b36e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6656
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

diff --git a/Bin/license.txt b/Bin/license.txt
deleted file mode 100644
index 051953a..0000000
--- a/Bin/license.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 - 2022 KDU Project
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/KDU.sha256 b/KDU.sha256
index f7a14dc..17a4b42 100644
--- a/KDU.sha256
+++ b/KDU.sha256
@@ -1,6 +1,3 @@
-293cb9a86a3f89e377ef5c6716d70bbdfd9c57ff0a07d484bd8abc1f521e70cc *Bin\dummy.sys
-82370b38b940f98013a6506a82c35913ec810f312d93b93b5406f3caf07bda9f *Bin\dummy2.sys
-751d35646474f1854972d6cc45c5b7419933e36fabe013eba785f276ec566d25 *Bin\license.txt
 323d910f93683453d45239a0528d3c3cda7f2608fca864fd2a687184ffe129fe *Help\kdu1.png
 a1d7a51549914833a3414a93646952c25deabe072d8a271b54e10727f923b479 *Help\kdu2.png
 d2c38793dc0a55da29fd8336f397b9a9374690747d0d210d453f32c42cad9d84 *Help\kdu3.png
@@ -59,7 +56,7 @@ f0beb5db4e2771b9b212bff58a77dd34687e028963a7fb40e7c944a7fd872614 *Source\Hamakaz
 ad77ae168188a9748713ab5f7532447ca50a539fa8ebbec5ac86b273696b028e *Source\Hamakaze\tests.h
 2f9bba7bf761a8e6908132ae93d81aaaa38cbdebd38e2557505ea6309bbd2391 *Source\Hamakaze\victim.cpp
 b4165a29658b4770627aaac15bc36add0a47892d738920de1fc6ec73bb1c3cce *Source\Hamakaze\victim.h
-88b52fa7591526b119ac218956a7e19379f6383d6277cdc0bf00007ec3c0d37e *Source\Hamakaze\wdksup.h
+583eff47116a9b49ea04b93f627d4fe62913f64ec70ab826202d8e23b1b3889a *Source\Hamakaze\wdksup.h
 31860c95db21761086e2979753e981d6435f27435dead3ed7e4687e99bb878d4 *Source\Hamakaze\hde\hde64.c
 fd5b39e2865e12b9525ebda8fd9e9658b341ead5932d1bcb412a189f81ca42ca *Source\Hamakaze\hde\hde64.h
 9d37519623d404987300d3f3258148ba9adddfe1bed5f89a0e9e47646819c9c7 *Source\Hamakaze\hde\pstdint.h
@@ -68,7 +65,7 @@ b1350783a851e6345b880c8a5313e871d2249aa5524f41406c52fa62483f2229 *Source\Hamakaz
 015a6aff991174a881650c61fe1b28c5bfe3116a02a32abe5295ff389c5b7099 *Source\Hamakaze\idrv\atszio.h
 8e22d2a218561bd13ab8fbb9a6ef0949ab1e3b8cd70bfc9ccf2cd8ae3507927d *Source\Hamakaze\idrv\dbk.cpp
 24f81b4fdc1b924a36c981fb175b2dccebd7d029d6caed85fb731b74b22c7386 *Source\Hamakaze\idrv\dbk.h
-f438f20675618fe9babe9c10bf27b97987822d28fd4bbc300ef6119b3f1e906f *Source\Hamakaze\idrv\dbutil.cpp
+e7a1432ad47fb4d73d9300a6fdc2ae4fa2906821db327c028fdff15c660e4690 *Source\Hamakaze\idrv\dbutil.cpp
 ad955406989b80564e7e4cc400721e62d6d5c193e22037b075e07dd616f3c845 *Source\Hamakaze\idrv\dbutil.h
 791a4d40f3f5076d0e6ed47e7db972f448ccc78ca578c35f11db637962c868a5 *Source\Hamakaze\idrv\directio64.cpp
 73a97fa34df9c0733981536f2079d1eab89bfaf36b4c5d0003cb87d504764ec3 *Source\Hamakaze\idrv\directio64.h
diff --git a/README.md b/README.md
index 0c6f8a7..eedc948 100644
--- a/README.md
+++ b/README.md
@@ -146,15 +146,24 @@ When in -map mode KDU for most available providers will by default use 3rd party
 
 KDU uses shellcode to map input drivers and execute their DriverEntry. There are few shellcode variants embedded into KDU. Shellcode V1, V2 and V3 used together with 3rd party victim driver (Process Explorer, by default). They are implemented as fake driver dispatch entry and their differences are: V1 uses newly created system thread to execute code, V2 uses system work items, V3 manually builds driver object and runs DriverEntry as if this driver was loaded normally. Shellcode V4 is simplified version of previous variants intended to be run not like an driver dispatch entry. While theoretically all "providers" can support all variants this implementation is limited per provider. You can view it by typing -list command and looking for shellcode support mask. Currently all providers except N21 support V1, V2 and V3 variants.
 
-# Build 
+# Build and Notes
 
 KDU comes with full source code.
 In order to build from source you need Microsoft Visual Studio 2019 and later versions. For driver builds you need Microsoft Windows Driver Kit 10 and/or above.
 
+Complete working binaries include: kdu.exe (main executable) and drv64.dll (drivers database). They must reside in the same directory that must have R/W access enabled for kdu.exe. All binaries MUST BE compiled in "Release" configuration.
+
 # Utils and Notes
 
 GenAsIo2Unlock is a special utility used to generate "unlocking" resource which is required for working with AsIO2 driver. Full source of this utility included in Source\Utils\GenAsIo2Unlock. Compiled version located in Sources\Hamakaze\Utils\GenAsIo2Unlock.exe. **Warning this utility is set on execution at post-build-event for both Debug/Release configurations.** If you don't want to run precompiled version replace it with newly compiled from sources. If you remove this post-build-event newly compiled KDU will NOT BE ABLE to use AsIO2 driver (provider #13).
 
+# Reporting bugs and incompatibilities
+
+If you expirienced bug or incompatibility while using KDU with 3rd party software or OS feel free to fill the issue. However if this incompatibility is caused by your own actions such reports will be ignored. Any BSOD reports should include minidump attached or your own dump analysis (windbg !analyze -v), issues without these information will be ignored.
+
+Anticheat, antimalware incompatibilities will be ignored, that's your own fault.
+
+
 # Disclaimer
 
 Using this program might crash your computer with BSOD. Compiled binary and source code provided AS-IS in hope it will be useful BUT WITHOUT WARRANTY OF ANY KIND. Since KDU rely on completely bugged and vulnerable drivers security of computer where it executed maybe put at risk. Make sure you understand what you do.
diff --git a/Source/Hamakaze/idrv/dbutil.cpp b/Source/Hamakaze/idrv/dbutil.cpp
index 03ba6f2..77a9675 100644
--- a/Source/Hamakaze/idrv/dbutil.cpp
+++ b/Source/Hamakaze/idrv/dbutil.cpp
@@ -6,7 +6,7 @@
 *
 *  VERSION:     1.27
 *
-*  DATE:        10 Nov 2022
+*  DATE:        14 Nov 2022
 *
 *  Dell BIOS Utility driver routines.
 *
@@ -57,7 +57,7 @@ BOOL DbUtilManageFiles(
         // Drop DbUtilDrv2.
         //
         if (!KDUProvExtractVulnerableDriver(Context)) {
-            lastError = ERROR_INTERNAL_ERROR;
+            SetLastError(ERROR_INTERNAL_ERROR);
             return FALSE;
         }
 
diff --git a/Source/Hamakaze/wdksup.h b/Source/Hamakaze/wdksup.h
index e2b30cf..843ffea 100644
--- a/Source/Hamakaze/wdksup.h
+++ b/Source/Hamakaze/wdksup.h
@@ -6,7 +6,7 @@
 *
 *  VERSION:     1.27
 *
-*  DATE:        01 Nov 2022
+*  DATE:        11 Nov 2022
 *
 *  Header file for NT WDK definitions.
 *
@@ -54,6 +54,197 @@ typedef _Enum_is_bitflag_ enum _WORK_QUEUE_TYPE {
     CustomPriorityWorkQueue = 32
 } WORK_QUEUE_TYPE;
 
+#include "pshpack4.h"
+typedef struct _CM_PARTIAL_RESOURCE_DESCRIPTOR {
+    UCHAR Type;
+    UCHAR ShareDisposition;
+    USHORT Flags;
+    union {
+
+        //
+        // Range of resources, inclusive.  These are physical, bus relative.
+        // It is known that Port and Memory below have the exact same layout
+        // as Generic.
+        //
+
+        struct {
+            PHYSICAL_ADDRESS Start;
+            ULONG Length;
+        } Generic;
+
+        //
+        //
+
+        struct {
+            PHYSICAL_ADDRESS Start;
+            ULONG Length;
+        } Port;
+
+        //
+        //
+
+        struct {
+#if defined(NT_PROCESSOR_GROUPS)
+            USHORT Level;
+            USHORT Group;
+#else
+            ULONG Level;
+#endif
+            ULONG Vector;
+            KAFFINITY Affinity;
+        } Interrupt;
+
+        //
+        // Values for message signaled interrupts are distinct in the
+        // raw and translated cases.
+        //
+
+        struct {
+            union {
+                struct {
+#if defined(NT_PROCESSOR_GROUPS)
+                    USHORT Group;
+#else
+                    USHORT Reserved;
+#endif
+                    USHORT MessageCount;
+                    ULONG Vector;
+                    KAFFINITY Affinity;
+                } Raw;
+
+                struct {
+#if defined(NT_PROCESSOR_GROUPS)
+                    USHORT Level;
+                    USHORT Group;
+#else
+                    ULONG Level;
+#endif
+                    ULONG Vector;
+                    KAFFINITY Affinity;
+                } Translated;
+            } DUMMYUNIONNAME;
+        } MessageInterrupt;
+
+        //
+        // Range of memory addresses, inclusive. These are physical, bus
+        // relative. The value should be the same as the one passed to
+        // HalTranslateBusAddress().
+        //
+
+        struct {
+            PHYSICAL_ADDRESS Start;    // 64 bit physical addresses.
+            ULONG Length;
+        } Memory;
+
+        //
+        // Physical DMA channel.
+        //
+
+        struct {
+            ULONG Channel;
+            ULONG Port;
+            ULONG Reserved1;
+        } Dma;
+
+        //
+        // Device driver private data, usually used to help it figure
+        // what the resource assignments decisions that were made.
+        //
+
+        struct {
+            ULONG Data[3];
+        } DevicePrivate;
+
+        //
+        // Bus Number information.
+        //
+
+        struct {
+            ULONG Start;
+            ULONG Length;
+            ULONG Reserved;
+        } BusNumber;
+
+        //
+        // Device Specific information defined by the driver.
+        // The DataSize field indicates the size of the data in bytes. The
+        // data is located immediately after the DeviceSpecificData field in
+        // the structure.
+        //
+
+        struct {
+            ULONG DataSize;
+            ULONG Reserved1;
+            ULONG Reserved2;
+        } DeviceSpecificData;
+
+        // The following structures provide support for memory-mapped
+        // IO resources greater than MAXULONG
+        struct {
+            PHYSICAL_ADDRESS Start;
+            ULONG Length40;
+        } Memory40;
+
+        struct {
+            PHYSICAL_ADDRESS Start;
+            ULONG Length48;
+        } Memory48;
+
+        struct {
+            PHYSICAL_ADDRESS Start;
+            ULONG Length64;
+        } Memory64;
+
+
+    } u;
+} CM_PARTIAL_RESOURCE_DESCRIPTOR, * PCM_PARTIAL_RESOURCE_DESCRIPTOR;
+#include "poppack.h"
+
+//
+// A Partial Resource List is what can be found in the ARC firmware
+// or will be generated by ntdetect.com.
+// The configuration manager will transform this structure into a Full
+// resource descriptor when it is about to store it in the regsitry.
+//
+// Note: There must a be a convention to the order of fields of same type,
+// (defined on a device by device basis) so that the fields can make sense
+// to a driver (i.e. when multiple memory ranges are necessary).
+//
+
+typedef struct _CM_PARTIAL_RESOURCE_LIST {
+    USHORT Version;
+    USHORT Revision;
+    ULONG Count;
+    CM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptors[1];
+} CM_PARTIAL_RESOURCE_LIST, * PCM_PARTIAL_RESOURCE_LIST;
+
+//
+// A Full Resource Descriptor is what can be found in the registry.
+// This is what will be returned to a driver when it queries the registry
+// to get device information; it will be stored under a key in the hardware
+// description tree.
+//
+// Note: There must a be a convention to the order of fields of same type,
+// (defined on a device by device basis) so that the fields can make sense
+// to a driver (i.e. when multiple memory ranges are necessary).
+//
+
+typedef struct _CM_FULL_RESOURCE_DESCRIPTOR {
+    INTERFACE_TYPE InterfaceType; // unused for WDM
+    ULONG BusNumber; // unused for WDM
+    CM_PARTIAL_RESOURCE_LIST PartialResourceList;
+} CM_FULL_RESOURCE_DESCRIPTOR, * PCM_FULL_RESOURCE_DESCRIPTOR;
+
+//
+// The Resource list is what will be stored by the drivers into the
+// resource map via the IO API.
+//
+
+typedef struct _CM_RESOURCE_LIST {
+    ULONG Count;
+    CM_FULL_RESOURCE_DESCRIPTOR List[1];
+} CM_RESOURCE_LIST, * PCM_RESOURCE_LIST;
+
 typedef
 VOID
 WORKER_THREAD_ROUTINE(