From 9f7128a429a5728dfb38f6b7ad834bdd6d34cf12 Mon Sep 17 00:00:00 2001 From: hfiref0x Date: Fri, 9 Dec 2022 11:43:54 +0700 Subject: [PATCH] v 1.2.8 128 release --- KDU.sha256 | 9 ++- Source/Hamakaze/KDU.vcxproj.user | 4 +- Source/Hamakaze/consts.h | 94 -------------------------------- Source/Hamakaze/idrv/ryzen.cpp | 10 +++- Source/Hamakaze/kduprov.h | 4 +- Source/Hamakaze/sup.cpp | 6 +- 6 files changed, 18 insertions(+), 109 deletions(-) delete mode 100644 Source/Hamakaze/consts.h diff --git a/KDU.sha256 b/KDU.sha256 index 0ab08bd..988312c 100644 --- a/KDU.sha256 +++ b/KDU.sha256 @@ -24,7 +24,6 @@ d45cf40c855a135898e4b35d0b5b2d00e3ad251a97d3f47990248116f22ff45e *Source\Example 10b9fe09b9357cb3c35a00a8b09ae24141ec5941a37c461c2a296d822aa2b512 *Source\Examples\DummyDrv2\dummy\r3request.c f12057a99c6b20abf6d9c3df949d794b124ca19b189498ce2beaa5beeb2b077c *Source\Hamakaze\compress.cpp 09fa3cdaa1416b81ba5ee304cf24897726902b9d33a76d879f604b7fe26b4dcc *Source\Hamakaze\compress.h -7ab76cd44d765178c690d1f48bef705b34c4fe97fb11822b28ece3ff7d351f62 *Source\Hamakaze\consts.h 09970cfcb9bfb7a8964ae4ec48fd15c1805e93ea81c858de2793691eefda3881 *Source\Hamakaze\diag.cpp a4fa97b9f2be414bc49881450d5935d2b48c1029d3bee655cd6e77e645327d74 *Source\Hamakaze\diag.h 849799b216483d532efa4174e3f2b38d0c812f1ff9b5d98ae41c10c0459f1e04 *Source\Hamakaze\drvmap.cpp @@ -36,10 +35,10 @@ ea0d8d42a5e7d7fb908c52351f99c69f2019c105d07a1f536756691ab2a74174 *Source\Hamakaz 888a436b666b00592d29e8a2e82a9b5c7f0c1d4890aaab8cb2f623181ad07092 *Source\Hamakaze\ipcsvc.h 453492ffb36f26cb4d1fc1ad6c0953be45425f98d5fe8de3f12d768f4d9a947c *Source\Hamakaze\KDU.vcxproj 67808d9ad6f599957d11e5c36ec3845bcdacb6a97337ef96c41af7e5a9d8564e *Source\Hamakaze\KDU.vcxproj.filters -c27015b11e42f5fd549224c499386720b27a82dc6464da0b75672ca3ec606ffd *Source\Hamakaze\KDU.vcxproj.user +7bbc22af4258dd85e73313ea3186e5beb84151b1be26c2952f7cc260577b3491 *Source\Hamakaze\KDU.vcxproj.user d0c73c56c8ff26566963332c79992762e8ad83832018267cddab85bd4b1b52ba *Source\Hamakaze\kduplist.h 9282d0885c4961e896423adf431479d752a91ad7fbf036df4a94a3967510b188 *Source\Hamakaze\kduprov.cpp -7b9059d8beb6c9390db2d7f1cb398e78b1100c5f8a838a1604bbafbb4be0b8eb *Source\Hamakaze\kduprov.h +63f837d245a5fb46f68ff5e522d7e46703e01e6ed7bea261245b72fd0802b044 *Source\Hamakaze\kduprov.h 79e850d593d17f9f6b586050a20f8a1bba5324d92270e2c6f4161b8332c166a4 *Source\Hamakaze\main.cpp e1a8de39e2d3d0bae5d9bbe1b18e849f5d070feb1d37f838176ede5a401f35ec *Source\Hamakaze\pagewalk.cpp 545ecf7e669b6b28753a02e33fae6f503750d26cf0bf9089701f401fd24e0dd1 *Source\Hamakaze\pagewalk.h @@ -51,7 +50,7 @@ eb15810b52b16482f3a3a679fbeed102257bfa0416243e74fce5b634daf9b074 *Source\Hamakaz 37b72edb872268e4e9f8a12853f4cbf726038cf7f0dc5e0f4239888818f18fed *Source\Hamakaze\shellcode.h 5428b9eb02810dbc4bfd715ec657ee35a5e61e53079c65f05e1eea4f8a6fa4a0 *Source\Hamakaze\shellmasm.asm e35386b3196b64c28fcd8f09eeb8b74adab7ec05ccf38b4041cee4b04f9eab1f *Source\Hamakaze\sig.h -f2bd264078225c32c71f8fed3fc97d2d26ef30f1ba1b7f3d84998a07f7c8fbd1 *Source\Hamakaze\sup.cpp +cf7a0bee79420caa31bc825151ca226b8627e90eb7c6e925dd39882b2456f5a5 *Source\Hamakaze\sup.cpp 988501759bf5c44868569724ea249f22da600675a012aa2f59dccafe97b3e164 *Source\Hamakaze\sup.h 23a3857c01b3decee12138abcb90ec8e7751c7eec3038c546a47b9b76465b770 *Source\Hamakaze\tests.cpp ad77ae168188a9748713ab5f7532447ca50a539fa8ebbec5ac86b273696b028e *Source\Hamakaze\tests.h @@ -95,7 +94,7 @@ f9463d258e2528738ee749a86683079e8b870b8c84d292352952be207b9daff5 *Source\Hamakaz 8449d829c3285f5a22521fba0db1516c487818f901fd28939fc18fbc3da0eedb *Source\Hamakaze\idrv\procexp.h bd0c80bc267d1fa0b423a453a22958a8b1ab1ede29291217cc045a9a877a347f *Source\Hamakaze\idrv\rtcore.cpp 08f75ea88874a507c132bafc412c88f9cc9862f78c238dcbd0cc480a04a438f4 *Source\Hamakaze\idrv\rtcore.h -4d9e8e5e822dcb1c8ff02bf2698041aad54a0456935ff1de0be84c01951f708c *Source\Hamakaze\idrv\ryzen.cpp +12b368a6176ca9d171ea28cb2ff0182be5f73d5db17854552894875925dec548 *Source\Hamakaze\idrv\ryzen.cpp 653d97baf28622ea8ffa0fdc99c201343213ab0a7318caef012a8967cc51660c *Source\Hamakaze\idrv\ryzen.h a0ed8a22c14b35bccd1ff0f45c8b23cad0f8c3af1d8e924caf4bfd63dfb02d89 *Source\Hamakaze\idrv\rzpnk.cpp 36ec0baeec7b61dbd9936507fcf1bf5aefec08e96ffe3bcb4883785ea2d9a542 *Source\Hamakaze\idrv\rzpnk.h diff --git a/Source/Hamakaze/KDU.vcxproj.user b/Source/Hamakaze/KDU.vcxproj.user index 47094a7..c665ea0 100644 --- a/Source/Hamakaze/KDU.vcxproj.user +++ b/Source/Hamakaze/KDU.vcxproj.user @@ -1,11 +1,11 @@  - -list + -prv 30 -map c:\install\dummy2.sys WindowsLocalDebugger - -list + -prv 30 -map c:\install\dummy2.sys WindowsLocalDebugger \ No newline at end of file diff --git a/Source/Hamakaze/consts.h b/Source/Hamakaze/consts.h deleted file mode 100644 index 1f4cc8f..0000000 --- a/Source/Hamakaze/consts.h +++ /dev/null @@ -1,94 +0,0 @@ -/******************************************************************************* -* -* (C) COPYRIGHT AUTHORS, 2020 - 2022 -* -* TITLE: CONSTS.H -* -* VERSION: 1.27 -* -* DATE: 08 Nov 2022 -* -* Global consts. -* -* THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -* ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED -* TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -* PARTICULAR PURPOSE. -* -*******************************************************************************/ - -#pragma once - -#define KDU_VERSION_MAJOR 1 -#define KDU_VERSION_MINOR 2 -#define KDU_VERSION_REVISION 7 -#define KDU_VERSION_BUILD 2211 - -#define KDU_BASE_ID 0xff123456 -#define KDU_SYNC_MUTANT 0xabcd - -#define NT_REG_PREP L"\\Registry\\Machine" -#define DRIVER_REGKEY L"%wS\\System\\CurrentControlSet\\Services\\%wS" - -#define PROCEXP152 L"PROCEXP152" -#define PROCEXP_DESC L"Process Explorer" - -#define NTOSKRNL_EXE L"ntoskrnl.exe" -#define CI_DLL L"CI.dll" - -#define DRV64DLL L"drv64.dll" -#define DUMMYDLL L"SB_SMBUS_SDK.dll" - -#define WINIO_BASE_DESC "WinIo by Yariv Kaplan" -#define WINRING0_BASE_DESC "WinRing0 by Noriyuki Miyazaki" -#define MAPMEM_BASE_DESC "MapMem from NTDDK 3.51" -#define PHYMEM_BASE_DESC "PhyMem by akui" - -#define SHELL_POOL_TAG ' oI' - -#define PROVIDER_RES_KEY ' owo' // Giving you enough uwu's. - -#define SYSTEM_PID_MAGIC 4 - -#define PROCEXP152_DISPATCH_OFFSET 0x2220 // Valid only for 1.5.2 - -// -// Data id table -// -#define IDR_DATA_DBUTILCAT 1000 -#define IDR_DATA_DBUTILINF 1001 -#define IDR_DATA_KMUEXE 1002 -#define IDR_DATA_KMUSIG 1003 -#define IDR_DATA_ASUSCERTSERVICE 1004 - -// -// Driver id table -// -#define IDR_PROCEXP 100 -#define IDR_iQVM64 103 -#define IDR_RTCORE64 105 -#define IDR_GDRV 106 -#define IDR_ATSZIO64 107 -#define IDR_MSIO64 108 -#define IDR_GLCKIO2 109 -#define IDR_ENEIO64 110 -#define IDR_WINRING0 111 -#define IDR_ENETECHIO64 112 -#define IDR_PHYMEMX64 113 -#define IDR_RTKIO64 114 -#define IDR_ENETECHIO64B 115 -#define IDR_LHA 116 -#define IDR_ASUSIO2 117 -#define IDR_DIRECTIO64 118 -#define IDR_GMERDRV 119 -#define IDR_DBUTIL23 120 -#define IDR_MIMIDRV 121 -#define IDR_KPH 122 -#define IDR_DBUTILDRV2 123 -#define IDR_DBK64 124 -#define IDR_ASUSIO3 125 -#define IDR_HW64 126 -#define IDR_SYSDRV3S 127 -#define IDR_ZEMANA 128 -#define IDR_RESERVED1 129 -#define IDR_RESERVED2 130 diff --git a/Source/Hamakaze/idrv/ryzen.cpp b/Source/Hamakaze/idrv/ryzen.cpp index 7f41eb6..2ed4337 100644 --- a/Source/Hamakaze/idrv/ryzen.cpp +++ b/Source/Hamakaze/idrv/ryzen.cpp @@ -6,7 +6,7 @@ * * VERSION: 1.28 * -* DATE: 02 Dec 2022 +* DATE: 07 Dec 2022 * * AMD Ryzen Master Service Driver routines. * @@ -33,9 +33,15 @@ BOOL RmValidatePrerequisites( _In_ KDU_CONTEXT* Context ) { + BOOL bResult; UNREFERENCED_PARAMETER(Context); - return supIsSupportedCpuVendor(CPU_VENDOR_AMD, CPU_VENDOR_AMD_LENGTH); + bResult = supIsSupportedCpuVendor(CPU_VENDOR_AMD, CPU_VENDOR_AMD_LENGTH); + + if (!bResult) + supPrintfEvent(kduEventError, "[!] Abort, AMD CPU is required.\r\n"); + + return bResult; } diff --git a/Source/Hamakaze/kduprov.h b/Source/Hamakaze/kduprov.h index 6bf6fc9..399f5cf 100644 --- a/Source/Hamakaze/kduprov.h +++ b/Source/Hamakaze/kduprov.h @@ -171,8 +171,8 @@ typedef struct _KDU_PROVIDER { provMapDriver MapDriver; provControlDSE ControlDSE; - provReadKernelVM ReadKernelVM; - provWriteKernelVM WriteKernelVM; + provReadKernelVM ReadKernelVM; //optional + provWriteKernelVM WriteKernelVM; //optional provVirtualToPhysical VirtualToPhysical; //optional provQueryPML4 QueryPML4Value; //optional diff --git a/Source/Hamakaze/sup.cpp b/Source/Hamakaze/sup.cpp index 350e1a0..be8f946 100644 --- a/Source/Hamakaze/sup.cpp +++ b/Source/Hamakaze/sup.cpp @@ -6,7 +6,7 @@ * * VERSION: 1.28 * -* DATE: 21 Nov 2022 +* DATE: 07 Dec 2022 * * Program global support routines. * @@ -85,7 +85,6 @@ NTSTATUS supCallDriverEx( } - if (IoStatus) *IoStatus = ioStatus; @@ -1679,7 +1678,6 @@ BOOL supManageDummyDll( return FALSE; } - if (fRemove) { HMODULE hModule = GetModuleHandle(lpDllName); @@ -2611,7 +2609,7 @@ PCM_RESOURCE_LIST supQueryPhysicalMemoryLayout( result = RegQueryValueEx(hKey, lpValue, 0, &dwType, NULL, &cbData); - if (result == ERROR_SUCCESS) { + if (result == ERROR_SUCCESS && dwType == REG_RESOURCE_LIST) { pList = (PCM_RESOURCE_LIST)supHeapAlloc((SIZE_T)cbData); if (pList) {