Ros-diffs July 2022

ros-diffs@reactos.org

7 participants
26 discussions

[reactos] 01/02: [NTDLL_APITEST] Add test for some user mode exceptions
by Timo Kreuzer 14 Jul '22

14 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f659ac520157d41fb6f87… commit f659ac520157d41fb6f87f930782013a4003b02c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 26 16:44:57 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jul 14 18:35:28 2022 +0200 [NTDLL_APITEST] Add test for some user mode exceptions --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../rostests/apitests/ntdll/UserModeException.c | 324 +++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 327 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 39296e4d8f2..e1076a3a584 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -94,6 +94,7 @@ list(APPEND SOURCE RtlxUnicodeStringToOemSize.c StackOverflow.c SystemInfo.c + UserModeException.c Timer.c) if(ARCH STREQUAL "i386") diff --git a/modules/rostests/apitests/ntdll/UserModeException.c b/modules/rostests/apitests/ntdll/UserModeException.c new file mode 100644 index 00000000000..6cf1b5ca5a3 --- /dev/null +++ b/modules/rostests/apitests/ntdll/UserModeException.c @@ -0,0 +1,324 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for user mode exceptions + * COPYRIGHT: Copyright 2021 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include "precomp.h" +#include <pseh/pseh2.h> + +typedef enum _CPU_VENDOR +{ + CPU_VENDOR_INTEL, + CPU_VENDOR_AMD, + CPU_VENDOR_CYRIX, + CPU_VENDOR_VIA, + CPU_VENDOR_TRANSMETA, + CPU_VENDOR_UNKNOWN +} CPU_VENDOR; + +CPU_VENDOR g_CpuVendor; +ULONG g_CpuFeatures; + +#define CPU_FEATURE_VMX 0x01 +#define CPU_FEATURE_HV 0x02 + +typedef void (*PFUNC)(void); + +#define FL_INVALID 0 +#define FL_AMD 0x01 +#define FL_INTEL 0x02 +#define FL_CYRIX 0x04 +#define FL_VIA 0x08 +#define FL_TM 0x10 +#define FL_ANY (FL_AMD | FL_INTEL | FL_CYRIX | FL_VIA | FL_TM) + +#define FL_VMX 0x20 +#define FL_HV 0x40 + +#define FL_PRIV 0x100 +#define FL_ACC 0x200 +#define FL_INVLS 0x400 + +typedef struct _TEST_ENTRY +{ + ULONG Line; + UCHAR InstructionBytes[64]; + ULONG ExpectedAddressOffset; + ULONG Flags; +} TEST_ENTRY, *PTEST_ENTRY; + +static +CPU_VENDOR +DetermineCpuVendor(void) +{ + INT CpuInfo[4]; + union + { + INT ShuffledInts[3]; + CHAR VendorString[13]; + } Vendor; + + __cpuid(CpuInfo, 0); + Vendor.ShuffledInts[0] = CpuInfo[1]; + Vendor.ShuffledInts[1] = CpuInfo[3]; + Vendor.ShuffledInts[2] = CpuInfo[2]; + Vendor.VendorString[12] = 0; + trace("Vendor: %s\n", Vendor.VendorString); + + if (strcmp(Vendor.VendorString, "GenuineIntel") == 0) + { + return CPU_VENDOR_INTEL; + } + else if (strcmp(Vendor.VendorString, "AuthenticAMD") == 0) + { + return CPU_VENDOR_AMD; + } + else if (strcmp(Vendor.VendorString, "CyrixInstead") == 0) + { + return CPU_VENDOR_CYRIX; + } + else if (strcmp(Vendor.VendorString, "CentaurHauls") == 0) + { + return CPU_VENDOR_VIA; + } + else if (strcmp(Vendor.VendorString, "GenuineTMx86") == 0) + { + return CPU_VENDOR_TRANSMETA; + } + else + { + return CPU_VENDOR_UNKNOWN; + } +} + +static +void +DetermineCpuFeatures(void) +{ + INT CpuInfo[4]; + ULONG Features = 0; + + g_CpuVendor = DetermineCpuVendor(); + + __cpuid(CpuInfo, 1); + if (CpuInfo[2] & (1 << 5)) Features |= CPU_FEATURE_VMX; + if (CpuInfo[2] & (1 << 31)) Features |= CPU_FEATURE_HV; + trace("CPUID 1: 0x%x, 0x%x, 0x%x, 0x%x\n", CpuInfo[0], CpuInfo[1], CpuInfo[2], CpuInfo[3]); + + g_CpuFeatures = Features; +} + +TEST_ENTRY TestEntries[] = +{ + /* Some invalid instruction encodings */ + { __LINE__, { 0x0F, 0x0B, 0xC3 }, 0, FL_INVALID }, + { __LINE__, { 0x0F, 0x38, 0x0C, 0xC3 }, 0, FL_INVALID }, +#ifdef _M_AMD64 + { __LINE__, { 0x06, 0xC3 }, 0, FL_INVALID }, +#endif + + /* Privileged instructions */ + { __LINE__, { 0xF4, 0xC3 }, 0, FL_ANY | FL_PRIV }, // HLT + { __LINE__, { 0xFA, 0xC3 }, 0, FL_ANY | FL_PRIV }, // CLI + { __LINE__, { 0xFB, 0xC3 }, 0, FL_ANY | FL_PRIV }, // STI + { __LINE__, { 0x0F, 0x06, 0xC3 }, 0, FL_ANY | FL_PRIV }, // CLTS +#ifdef _M_AMD64 + { __LINE__, { 0x0F, 0x07, 0xC3 }, 0, FL_ANY | FL_PRIV }, // SYSRET +#endif + { __LINE__, { 0x0F, 0x08, 0xC3 }, 0, FL_ANY | FL_PRIV }, // INVD + { __LINE__, { 0x0F, 0x09, 0xC3 }, 0, FL_ANY | FL_PRIV }, // WBINVD + { __LINE__, { 0x0F, 0x20, 0xC3 }, 0, FL_ANY | FL_PRIV }, // MOV CR, XXX + { __LINE__, { 0x0F, 0x21, 0xC3 }, 0, FL_ANY | FL_PRIV }, // MOV DR, XXX + { __LINE__, { 0x0F, 0x22, 0xC3 }, 0, FL_ANY | FL_PRIV }, // MOV XXX, CR + { __LINE__, { 0x0F, 0x23, 0xC3 }, 0, FL_ANY | FL_PRIV }, // MOV YYY, DR + { __LINE__, { 0x0F, 0x30, 0xC3 }, 0, FL_ANY | FL_PRIV }, // WRMSR + { __LINE__, { 0x0F, 0x32, 0xC3 }, 0, FL_ANY | FL_PRIV }, // RDMSR + { __LINE__, { 0x0F, 0x33, 0xC3 }, 0, FL_ANY | FL_PRIV }, // RDPMC + { __LINE__, { 0x0F, 0x35, 0xC3 }, 0, FL_ANY | FL_PRIV }, // SYSEXIT + { __LINE__, { 0x0F, 0x78, 0xC8, 0xC3 }, 0, FL_INTEL | FL_HV | FL_ACC }, // VMREAD EAX, ECX + { __LINE__, { 0x0F, 0x79, 0xC1, 0xC3 }, 0, FL_INTEL | FL_HV | FL_ACC }, // VMWRITE EAX, ECX + { __LINE__, { 0x0F, 0x00, 0x10, 0xC3 }, 0, FL_ANY | FL_PRIV }, // LLDT WORD PTR [EAX] + { __LINE__, { 0x0F, 0x00, 0x50, 0x00, 0xC3 }, 0, FL_ANY | FL_PRIV }, // LLDT WORD PTR [EAX + 0x00] + { __LINE__, { 0x0F, 0x00, 0x18, 0xC3 }, 0, FL_ANY | FL_PRIV }, // LTR WORD PTR [EAX] + { __LINE__, { 0x0F, 0x00, 0x58, 0x00, 0xC3 }, 0, FL_ANY | FL_PRIV }, // LTR WORD PTR [EAX + 0x00] + { __LINE__, { 0x0F, 0x01, 0xC1, 0xC3 }, 0, FL_INTEL | FL_HV }, // VMCALL + { __LINE__, { 0x0F, 0x01, 0xC2, 0xC3 }, 0, FL_INTEL | FL_HV | FL_ACC }, // VMLAUNCH + { __LINE__, { 0x0F, 0x01, 0xC3, 0xC3 }, 0, FL_INTEL | FL_HV | FL_ACC }, // VMRESUME + { __LINE__, { 0x0F, 0x01, 0xC4, 0xC3 }, 0, FL_INTEL | FL_HV | FL_ACC }, // VMXOFF + { __LINE__, { 0x0F, 0x01, 0xC8, 0xC3 }, 0, FL_INVALID }, // MONITOR + { __LINE__, { 0x0F, 0x01, 0xC9, 0xC3 }, 0, FL_INVALID }, // MWAIT + // { __LINE__, { 0x0F, 0x01, 0xD1, 0xC3 }, 0, FL_ANY | FL_PRIV }, // XSETBV FIXME: privileged or access violation? +#ifdef _M_AMD64 + { __LINE__, { 0x0F, 0x01, 0xF8, 0xC3 }, 0, FL_ANY | FL_PRIV }, // SWAPGS +#endif + { __LINE__, { 0x0F, 0x01, 0x10, 0xC3 }, 0, FL_ANY | FL_PRIV }, // LGDT [EAX] + { __LINE__, { 0x0F, 0x01, 0x18, 0xC3 }, 0, FL_ANY | FL_PRIV }, // LIDT [EAX] + { __LINE__, { 0x0F, 0x01, 0x30, 0xC3 }, 0, FL_ANY | FL_PRIV }, // LMSW [EAX] +#ifdef _M_AMD64 // Gives access violation on Test WHS for some reason + { __LINE__, { 0x0F, 0x01, 0x38, 0xC3 }, 0, FL_ANY | FL_PRIV }, // INVLPG [EAX] +#endif + { __LINE__, { 0x66, 0x0F, 0x38, 0x80, 0x01, 0xC3 }, 0, FL_INTEL | FL_HV | FL_ACC }, // INVEPT EAX,OWORD PTR [ECX] + { __LINE__, { 0x66, 0x0F, 0x38, 0x81, 0x01, 0xC3 }, 0, FL_INTEL | FL_HV | FL_ACC }, // INVVPID EAX,OWORD PTR [ECX] + { __LINE__, { 0x0F, 0xC7, 0x31, 0xC3 }, 0, FL_INTEL | FL_HV | FL_ACC }, // VMPTRLD QWORD PTR [ECX] + { __LINE__, { 0x66, 0x0F, 0xC7, 0x31, 0xC3 }, 0, FL_INTEL | FL_HV | FL_ACC }, // VMCLEAR QWORD PTR [ECX] + { __LINE__, { 0xF3, 0x0F, 0xC7, 0x31, 0xC3 }, 0, FL_INVALID }, // VMXON QWORD PTR [ECX] + { __LINE__, { 0x0F, 0xC7, 0xE0, 0xC3 }, 0, FL_INVALID }, // VMPTRST + + /* Test prefixes */ + { __LINE__, { 0x26, 0xF4, 0xC3 }, 0, FL_ANY | FL_PRIV }, // ES HLT + { __LINE__, { 0x2E, 0xF4, 0xC3 }, 0, FL_ANY | FL_PRIV }, // CS: HLT + { __LINE__, { 0x36, 0xF4, 0xC3 }, 0, FL_ANY | FL_PRIV }, // SS: HLT + { __LINE__, { 0x3E, 0xF4, 0xC3 }, 0, FL_ANY | FL_PRIV }, // DS: HLT + { __LINE__, { 0x64, 0xF4, 0xC3 }, 0, FL_ANY | FL_PRIV }, // FS: HLT + { __LINE__, { 0x65, 0xF4, 0xC3 }, 0, FL_ANY | FL_PRIV }, // GS: HLT + { __LINE__, { 0x66, 0xF4, 0xC3 }, 0, FL_ANY | FL_PRIV }, // DATA HLT + { __LINE__, { 0x67, 0xF4, 0xC3 }, 0, FL_ANY | FL_PRIV }, // ADDR HLT + { __LINE__, { 0xF0, 0xF4, 0xC3 }, 0, FL_ANY | FL_INVLS | FL_PRIV }, // LOCK HLT + { __LINE__, { 0xF2, 0xF4, 0xC3 }, 0, FL_ANY | FL_PRIV }, // REP HLT + { __LINE__, { 0xF3, 0xF4, 0xC3 }, 0, FL_ANY | FL_PRIV }, // REPZ HLT + { __LINE__, { 0x9B, 0xF4, 0xC3 }, 1, FL_ANY | FL_PRIV }, // WAIT // not a prefix +#ifdef _M_AMD64 + { __LINE__, { 0x40, 0xF4, 0xC3 }, 0, FL_ANY | FL_PRIV }, // REX HLT +#endif + { __LINE__, { 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0xC3 }, 0, FL_ANY }, // This one is OK +#ifdef _M_AMD64 + { __LINE__, { 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0xC3 }, 0, FL_ANY | FL_ACC }, // Too many prefixes +#else + { __LINE__, { 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0x26, 0xC3 }, 0, FL_INVALID }, // Too many prefixes +#endif + { __LINE__, { 0xF0, 0x90, 0xC3 }, 0, FL_INVLS }, // LOCK NOP + { __LINE__, { 0xF0, 0x83, 0x0C, 0x24, 0x00, 0xC3 }, 0, FL_ANY }, // LOCK OR DWORD PTR [ESP], 0x0 + { __LINE__, { 0x3E, 0x66, 0x67, 0xF0, 0xF3, 0xF4, 0xC3 }, 0, FL_ANY | FL_INVLS | FL_PRIV }, // DS: DATA ADDR LOCK REPZ HLT +#ifdef _M_AMD64 + /* Check non-canonical address access (causes a #GP) */ + { __LINE__, { 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xC3 }, 0, FL_ANY | FL_ACC }, // MOV AL, [0x1000000000000000] +#endif + +}; + +void Test_SingleInstruction( + PVOID RwxMemory, + PTEST_ENTRY TestEntry) +{ + PEXCEPTION_POINTERS ExcPtrs; + EXCEPTION_RECORD ExceptionRecord; + NTSTATUS ExpectedStatus, Status = STATUS_SUCCESS; + PFUNC Func = (PFUNC)RwxMemory; + ULONG Flags; + + RtlZeroMemory(&ExceptionRecord, sizeof(ExceptionRecord)); + + RtlCopyMemory(RwxMemory, + TestEntry->InstructionBytes, + sizeof(TestEntry->InstructionBytes)); + + _SEH2_TRY + { + Func(); + } + _SEH2_EXCEPT(ExcPtrs = _SEH2_GetExceptionInformation(), + ExceptionRecord = *ExcPtrs->ExceptionRecord, + EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + Flags = TestEntry->Flags; +#ifdef _M_IX86 + if (Flags & FL_INVLS) + { + ExpectedStatus = STATUS_INVALID_LOCK_SEQUENCE; + } + else +#endif + if (((g_CpuVendor == CPU_VENDOR_INTEL) && !(Flags & FL_INTEL)) || + ((g_CpuVendor == CPU_VENDOR_AMD) && !(Flags & FL_AMD)) || + ((g_CpuVendor == CPU_VENDOR_CYRIX) && !(Flags & FL_CYRIX)) || + ((g_CpuVendor == CPU_VENDOR_VIA) && !(Flags & FL_VIA))) + { + ExpectedStatus = STATUS_ILLEGAL_INSTRUCTION; + } + else if (((Flags & FL_VMX) && !(g_CpuFeatures & CPU_FEATURE_VMX)) || + ((Flags & FL_HV) && !(g_CpuFeatures & CPU_FEATURE_HV))) + { + ExpectedStatus = STATUS_ILLEGAL_INSTRUCTION; + } + else if (Flags & FL_PRIV) + { + ExpectedStatus = STATUS_PRIVILEGED_INSTRUCTION; + } + else if (Flags & FL_ACC) + { + ExpectedStatus = STATUS_ACCESS_VIOLATION; + } + else + { + ExpectedStatus = STATUS_SUCCESS; + } + + ok_hex_(__FILE__, TestEntry->Line, Status, ExpectedStatus); + ok_hex_(__FILE__, TestEntry->Line, ExceptionRecord.ExceptionCode, Status); + ok_hex_(__FILE__, TestEntry->Line, ExceptionRecord.ExceptionFlags, 0); + ok_ptr_(__FILE__, TestEntry->Line, ExceptionRecord.ExceptionRecord, NULL); + + if (Status == STATUS_SUCCESS) + { + ok_ptr_(__FILE__, TestEntry->Line, ExceptionRecord.ExceptionAddress, NULL); + } + else + { + ok_ptr_(__FILE__, TestEntry->Line, ExceptionRecord.ExceptionAddress, (PUCHAR)Func + TestEntry->ExpectedAddressOffset); + } + + if (Status == STATUS_ACCESS_VIOLATION) + { + ok_dec_(__FILE__, TestEntry->Line, ExceptionRecord.NumberParameters, 2); + ok_size_t_(__FILE__, TestEntry->Line, ExceptionRecord.ExceptionInformation[0], 0); + ok_size_t_(__FILE__, TestEntry->Line, ExceptionRecord.ExceptionInformation[1], (LONG_PTR)-1); + } + else + { + ok_dec_(__FILE__, TestEntry->Line, ExceptionRecord.NumberParameters, 0); +#if 0 // FIXME: These are inconsistent between Windows versions (simply uninitialized?) + ok_size_t_(__FILE__, TestEntry->Line, ExceptionRecord.ExceptionInformation[0], 0); + ok_size_t_(__FILE__, TestEntry->Line, ExceptionRecord.ExceptionInformation[1], 0); +#endif + } +} + +static +void +Test_InstructionFaults(void) +{ + PVOID RwxMemory; + ULONG i; + + /* Allocate a page of RWX memory */ + RwxMemory = VirtualAlloc(NULL, + PAGE_SIZE, + MEM_RESERVE | MEM_COMMIT, + PAGE_EXECUTE_READWRITE); + ok(RwxMemory != NULL, "Failed to allocate RWX memory!\n"); + if (RwxMemory == NULL) + { + return; + } + + for (i = 0; i < ARRAYSIZE(TestEntries); i++) + { + Test_SingleInstruction(RwxMemory, &TestEntries[i]); + } + + /* Clean up */ + VirtualFree(RwxMemory, 0, MEM_RELEASE); +} + +START_TEST(UserModeException) +{ + DetermineCpuFeatures(); + + Test_InstructionFaults(); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 3b88411cfb6..f5b265f0305 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -90,6 +90,7 @@ extern void func_RtlxUnicodeStringToAnsiSize(void); extern void func_RtlxUnicodeStringToOemSize(void); extern void func_StackOverflow(void); extern void func_TimerResolution(void); +extern void func_UserModeException(void); const struct test winetest_testlist[] = { @@ -180,6 +181,7 @@ const struct test winetest_testlist[] = { "RtlValidateUnicodeString", func_RtlValidateUnicodeString }, { "StackOverflow", func_StackOverflow }, { "TimerResolution", func_TimerResolution }, + { "UserModeException", func_UserModeException }, { 0, 0 } };

1 0

[reactos] 01/01: [CMLIB][NTOS:CM] Deduplicate other common definitions between CMLIB and the NTOS CM
by George Bișoc 10 Jul '22

10 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54a00aa8ebddbbfdc8261… commit 54a00aa8ebddbbfdc8261f918d19888cd5e41ecd Author: George Bișoc <fraizeraust99(a)gmail.com> AuthorDate: Sun Jul 10 14:35:53 2022 +0200 Commit: George Bișoc <fraizeraust99(a)gmail.com> CommitDate: Sun Jul 10 14:35:53 2022 +0200 [CMLIB][NTOS:CM] Deduplicate other common definitions between CMLIB and the NTOS CM Addendum to commit 8c2454e (r70605). Credits and courtesy go to Hermès BÉLUSCA - MAÏTO. CORE-10802 CORE-10793 --- ntoskrnl/include/internal/cm.h | 84 ++---------------------------------------- sdk/lib/cmlib/cmlib.h | 26 ++++++------- 2 files changed, 15 insertions(+), 95 deletions(-) diff --git a/ntoskrnl/include/internal/cm.h b/ntoskrnl/include/internal/cm.h index bd3dbe515e8..423c65b9a8d 100644 --- a/ntoskrnl/include/internal/cm.h +++ b/ntoskrnl/include/internal/cm.h @@ -40,12 +40,6 @@ #define CMTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__) #endif -// -// Hack since bigkeys are not yet supported -// -#define ASSERT_VALUE_BIG(h, s) \ - ASSERTMSG("Big keys not supported!\n", !CmpIsKeyValueBig(h, s)); - // // CM_KEY_CONTROL_BLOCK Signatures // @@ -67,19 +61,14 @@ // // CM_KEY_BODY Types // -#define CM_KEY_BODY_TYPE 0x6B793032 - -// -// CM_KEY_VALUE Types -// -#define CM_KEY_VALUE_SMALL 0x4 -#define CM_KEY_VALUE_BIG 0x3FD8 -#define CM_KEY_VALUE_SPECIAL_SIZE 0x80000000 +#define CM_KEY_BODY_TYPE 0x6B793032 // 'ky02' // // Number of various lists and hashes // +#if 0 // See sdk/lib/cmlib/cmlib.h #define CMP_SECURITY_HASH_LISTS 64 +#endif #define CMP_MAX_CALLBACKS 100 // @@ -115,7 +104,7 @@ // // Maximum size of Value Cache // -#define MAXIMUM_CACHED_DATA 2 * PAGE_SIZE +#define MAXIMUM_CACHED_DATA (2 * PAGE_SIZE) // // Hives to load on startup @@ -373,71 +362,6 @@ typedef struct _CM_DELAY_DEREF_KCB_ITEM PCM_KEY_CONTROL_BLOCK Kcb; } CM_DELAY_DEREF_KCB_ITEM, *PCM_DELAY_DEREF_KCB_ITEM; -// -// Use Count Log and Entry -// -typedef struct _CM_USE_COUNT_LOG_ENTRY -{ - HCELL_INDEX Cell; - PVOID Stack[7]; -} CM_USE_COUNT_LOG_ENTRY, *PCM_USE_COUNT_LOG_ENTRY; - -typedef struct _CM_USE_COUNT_LOG -{ - USHORT Next; - USHORT Size; - CM_USE_COUNT_LOG_ENTRY Log[32]; -} CM_USE_COUNT_LOG, *PCM_USE_COUNT_LOG; - -// -// Configuration Manager Hive Structure -// -typedef struct _CMHIVE -{ - HHIVE Hive; - HANDLE FileHandles[HFILE_TYPE_MAX]; - LIST_ENTRY NotifyList; - LIST_ENTRY HiveList; - EX_PUSH_LOCK HiveLock; - PKTHREAD HiveLockOwner; - PKGUARDED_MUTEX ViewLock; - PKTHREAD ViewLockOwner; - EX_PUSH_LOCK WriterLock; - PKTHREAD WriterLockOwner; - PERESOURCE FlusherLock; - EX_PUSH_LOCK SecurityLock; - PKTHREAD HiveSecurityLockOwner; - LIST_ENTRY LRUViewListHead; - LIST_ENTRY PinViewListHead; - PFILE_OBJECT FileObject; - UNICODE_STRING FileFullPath; - UNICODE_STRING FileUserName; - USHORT MappedViews; - USHORT PinnedViews; - ULONG UseCount; - ULONG SecurityCount; - ULONG SecurityCacheSize; - LONG SecurityHitHint; - PCM_KEY_SECURITY_CACHE_ENTRY SecurityCache; - LIST_ENTRY SecurityHash[CMP_SECURITY_HASH_LISTS]; - PKEVENT UnloadEvent; - PCM_KEY_CONTROL_BLOCK RootKcb; - BOOLEAN Frozen; - PWORK_QUEUE_ITEM UnloadWorkItem; - BOOLEAN GrowOnlyMode; - ULONG GrowOffset; - LIST_ENTRY KcbConvertListHead; - LIST_ENTRY KnodeConvertListHead; - PCM_CELL_REMAP_BLOCK CellRemapArray; - CM_USE_COUNT_LOG UseCountLog; - CM_USE_COUNT_LOG LockHiveLog; - ULONG Flags; - LIST_ENTRY TrustClassEntry; - ULONG FlushCount; - BOOLEAN HiveIsLoading; - PKTHREAD CreatorOwner; -} CMHIVE, *PCMHIVE; - // // Cached Value Index // diff --git a/sdk/lib/cmlib/cmlib.h b/sdk/lib/cmlib/cmlib.h index e4ae010702e..d1b8c0656fe 100644 --- a/sdk/lib/cmlib/cmlib.h +++ b/sdk/lib/cmlib/cmlib.h @@ -122,7 +122,7 @@ IN PRTL_BITMAP BitMapHeader); #define RtlCheckBit(BMH,BP) (((((PLONG)(BMH)->Buffer)[(BP) / 32]) >> ((BP) % 32)) & 0x1) - #define UNREFERENCED_PARAMETER(P) {(P)=(P);} + #define UNREFERENCED_PARAMETER(P) ((void)(P)) #define PKTHREAD PVOID #define PKGUARDED_MUTEX PVOID @@ -152,7 +152,9 @@ #undef PAGED_CODE #define PAGED_CODE() #define REGISTRY_ERROR ((ULONG)0x00000051L) + #else + // // Debug/Tracing support // @@ -214,17 +216,13 @@ #include "hivedata.h" #include "cmdata.h" -#if defined(_TYPEDEFS_HOST_H) || defined(_BLDR_) - -#define PCM_KEY_SECURITY_CACHE_ENTRY PVOID -#define PCM_KEY_CONTROL_BLOCK PVOID -#define PCM_CELL_REMAP_BLOCK PVOID +/* Forward declarations */ +typedef struct _CM_KEY_SECURITY_CACHE_ENTRY *PCM_KEY_SECURITY_CACHE_ENTRY; +typedef struct _CM_KEY_CONTROL_BLOCK *PCM_KEY_CONTROL_BLOCK; +typedef struct _CM_CELL_REMAP_BLOCK *PCM_CELL_REMAP_BLOCK; -// See also ntoskrnl/include/internal/cm.h -#define CMP_SECURITY_HASH_LISTS 64 - -// #endif // Commented out until one finds a way to properly include - // this header in the bootloader and in ntoskrnl. +// See ntoskrnl/include/internal/cm.h +#define CMP_SECURITY_HASH_LISTS 64 // // Use Count Log and Entry @@ -291,8 +289,6 @@ typedef struct _CMHIVE PKTHREAD CreatorOwner; } CMHIVE, *PCMHIVE; -#endif // See comment above - typedef struct _HV_HIVE_CELL_PAIR { PHHIVE Hive; @@ -312,9 +308,9 @@ typedef struct _HV_TRACK_CELL_REF extern ULONG CmlibTraceLevel; // -// Hack since bigkeys are not yet supported +// Hack since big keys are not yet supported // -#define ASSERT_VALUE_BIG(h, s) \ +#define ASSERT_VALUE_BIG(h, s) \ ASSERTMSG("Big keys not supported!\n", !CmpIsKeyValueBig(h, s)); //

1 0

[reactos] 01/01: [NTOS:MM] Fix VADs being inserted even though the quota would exceed
by Tuur Martens 06 Jul '22

06 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10126e7710b3d3ae1005e… commit 10126e7710b3d3ae1005ecfefd71f0cfb1573514 Author: Tuur Martens <tuurmartens4(a)gmail.com> AuthorDate: Wed Jun 29 10:49:05 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Jul 6 18:48:32 2022 +0200 [NTOS:MM] Fix VADs being inserted even though the quota would exceed Since we were charging the pool quota after the VAD insertion, if the quota charge failed, the VAD would still have been inserted. This commit attempts to resolve this issue by charging quota before inserting the VAD thus allowing the quota charge to fail early. Addendum to 884356a0. CORE-18028 --- ntoskrnl/mm/ARM3/mdlsup.c | 14 ++++++++---- ntoskrnl/mm/ARM3/procsup.c | 57 ++++++++++++++++++++++++++++------------------ ntoskrnl/mm/ARM3/virtual.c | 25 ++++++++++++-------- 3 files changed, 59 insertions(+), 37 deletions(-) diff --git a/ntoskrnl/mm/ARM3/mdlsup.c b/ntoskrnl/mm/ARM3/mdlsup.c index 0d74949cd16..cc6d2ffb4ec 100644 --- a/ntoskrnl/mm/ARM3/mdlsup.c +++ b/ntoskrnl/mm/ARM3/mdlsup.c @@ -74,10 +74,18 @@ MiMapLockedPagesInUserSpace( DPRINT1("FIXME: Need to check for large pages\n"); } + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + { + Vad = NULL; + goto Error; + } + /* Allocate a VAD for our mapped region */ Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD_LONG), 'ldaV'); if (Vad == NULL) { + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); Status = STATUS_INSUFFICIENT_RESOURCES; goto Error; } @@ -155,13 +163,8 @@ MiMapLockedPagesInUserSpace( MiLockProcessWorkingSetUnsafe(Process, Thread); ASSERT(Vad->EndingVpn >= Vad->StartingVpn); - MiInsertVad((PMMVAD)Vad, &Process->VadRoot); - Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); - if (!NT_SUCCESS(Status)) - goto Error; - /* Check if this is uncached */ if (CacheAttribute != MiCached) { @@ -279,6 +282,7 @@ Error: if (Vad != NULL) { ExFreePoolWithTag(Vad, 'ldaV'); + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); } ExRaiseStatus(Status); } diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index 4111d711e3c..f2a93ce6fa5 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -35,9 +35,17 @@ MiCreatePebOrTeb(IN PEPROCESS Process, ULONG AlignedSize; LARGE_INTEGER CurrentTime; + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + return Status; + /* Allocate a VAD */ Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD_LONG), 'ldaV'); - if (!Vad) return STATUS_NO_MEMORY; + if (!Vad) + { + Status = STATUS_NO_MEMORY; + goto FailPath; + } /* Setup the primary flags with the size, and make it commited, private, RW */ Vad->u.LongFlags = 0; @@ -94,18 +102,18 @@ MiCreatePebOrTeb(IN PEPROCESS Process, if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(Vad, 'ldaV'); - return STATUS_NO_MEMORY; + Status = STATUS_NO_MEMORY; + goto FailPath; } - Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(Vad, 'ldaV'); - return Status; - } /* Success */ return STATUS_SUCCESS; + +FailPath: + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + + return Status; } VOID @@ -859,12 +867,23 @@ MiInsertSharedUserPageVad( ULONG_PTR BaseAddress; NTSTATUS Status; + if (Process->QuotaBlock != NULL) + { + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Ran out of quota.\n"); + return Status; + } + } + /* Allocate a VAD */ Vad = ExAllocatePoolWithTag(NonPagedPool, sizeof(MMVAD_LONG), 'ldaV'); if (Vad == NULL) { DPRINT1("Failed to allocate VAD for shared user page\n"); - return STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_INSUFFICIENT_RESOURCES; + goto FailPath; } /* Setup the primary flags with the size, and make it private, RO */ @@ -898,23 +917,17 @@ MiInsertSharedUserPageVad( { DPRINT1("Failed to insert shared user VAD\n"); ExFreePoolWithTag(Vad, 'ldaV'); - return Status; + goto FailPath; } - if (Process->QuotaBlock != NULL) - { - Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Ran out of quota.\n"); - ExFreePoolWithTag(Vad, 'ldaV'); - return Status; - } - } - - /* Success */ return STATUS_SUCCESS; + +FailPath: + if (Process->QuotaBlock != NULL) + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + + return Status; } #endif diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index 5b54d8b4a28..e0804520435 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -4503,7 +4503,7 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle, PETHREAD CurrentThread = PsGetCurrentThread(); KAPC_STATE ApcState; ULONG ProtectionMask, QuotaCharge = 0, QuotaFree = 0; - BOOLEAN Attached = FALSE, ChangeProtection = FALSE; + BOOLEAN Attached = FALSE, ChangeProtection = FALSE, QuotaCharged = FALSE; MMPTE TempPte; PMMPTE PointerPte, LastPte; PMMPDE PointerPde; @@ -4763,6 +4763,16 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle, StartingAddress = (ULONG_PTR)PBaseAddress; } + // Charge quotas for the VAD + Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Quota exceeded.\n"); + goto FailPathNoLock; + } + + QuotaCharged = TRUE; + // // Allocate and initialize the VAD // @@ -4796,15 +4806,6 @@ NtAllocateVirtualMemory(IN HANDLE ProcessHandle, goto FailPathNoLock; } - // Charge quotas for the VAD - Status = PsChargeProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Quota exceeded.\n"); - ExFreePoolWithTag(Vad, 'SdaV'); - goto FailPathNoLock; - } - // // Detach and dereference the target process if // it was different from the current process @@ -5207,6 +5208,10 @@ FailPathNoLock: } _SEH2_END; } + else if (QuotaCharged) + { + PsReturnProcessNonPagedPoolQuota(Process, sizeof(MMVAD_LONG)); + } return Status; }

1 0

[reactos] 01/01: [NTOSKRNL] Fix a bug in MiDeleteVirtualAddresses
by Timo Kreuzer 05 Jul '22

05 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f606b36cffeaa3ab78bb7… commit f606b36cffeaa3ab78bb730db2fcee80ba61d2f6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 2 17:46:41 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Jul 5 19:29:05 2022 +0200 [NTOSKRNL] Fix a bug in MiDeleteVirtualAddresses When a PDE gets empty, we skip the address to the next PDE boundary, which might introduce an AddressGap, which wasn't handled before. --- ntoskrnl/mm/ARM3/virtual.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/mm/ARM3/virtual.c b/ntoskrnl/mm/ARM3/virtual.c index 4f5cd1b016b..5b54d8b4a28 100644 --- a/ntoskrnl/mm/ARM3/virtual.c +++ b/ntoskrnl/mm/ARM3/virtual.c @@ -714,10 +714,15 @@ MiDeleteVirtualAddresses(IN ULONG_PTR Va, if (MiDecrementPageTableReferences((PVOID)Va) == 0) { ASSERT(PointerPde->u.Long != 0); + /* Delete the PDE proper */ MiDeletePde(PointerPde, CurrentProcess); - /* Jump */ + + /* Continue with the next PDE */ Va = (ULONG_PTR)MiPdeToAddress(PointerPde + 1); + + /* Use this to detect address gaps */ + PointerPte++; break; } } @@ -733,8 +738,8 @@ MiDeleteVirtualAddresses(IN ULONG_PTR Va, if (Va > EndingAddress) return; - /* Otherwise, we exited because we hit a new PDE boundary, so start over */ - AddressGap = FALSE; + /* Check if we exited the loop regularly */ + AddressGap = (PointerPte != MiAddressToPte(Va)); } }

1 0

[reactos] 01/01: [DISKPART] Fix magic values in CreateLogicalPartition() and CreatePrimaryPartition()
by Eric Kohl 03 Jul '22

03 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57c84dd658c4d5a91e8b3… commit 57c84dd658c4d5a91e8b3081c8ababf5ac7f3ead Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 3 14:09:35 2022 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 3 14:10:02 2022 +0200 [DISKPART] Fix magic values in CreateLogicalPartition() and CreatePrimaryPartition() --- base/system/diskpart/create.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/system/diskpart/create.c b/base/system/diskpart/create.c index 52526573d85..6526f19d9f3 100644 --- a/base/system/diskpart/create.c +++ b/base/system/diskpart/create.c @@ -204,7 +204,7 @@ CreateLogicalPartition( ULONGLONG ullOffset = 0ULL; BOOL bNoErr = FALSE; #endif - UCHAR PartitionType = 6; + UCHAR PartitionType = PARTITION_HUGE; INT i, length; PWSTR pszSuffix = NULL; NTSTATUS Status; @@ -404,7 +404,7 @@ CreatePrimaryPartition( ULONGLONG ullOffset = 0ULL; BOOL bNoErr = FALSE; #endif - UCHAR PartitionType = 6; + UCHAR PartitionType = PARTITION_HUGE; INT i, length; PWSTR pszSuffix = NULL; NTSTATUS Status;

1 0

[reactos] 01/01: [WIN32K:ENG] EngAlphaBlend(): Release EnterLeaveSource on error (#4560)
by Serge Gautherie 02 Jul '22

02 Jul '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b671b1cf8f7c3dce718d8… commit b671b1cf8f7c3dce718d81f9067e07c66f878498 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jul 2 11:30:03 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jul 2 12:30:03 2022 +0300 [WIN32K:ENG] EngAlphaBlend(): Release EnterLeaveSource on error (#4560) Part of CORE-11156 Co-authored-by: Carlo Bramini <carlo.bramix(a)libero.it> --- win32ss/gdi/eng/alphablend.c | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/gdi/eng/alphablend.c b/win32ss/gdi/eng/alphablend.c index 869698989ba..012d8c984be 100644 --- a/win32ss/gdi/eng/alphablend.c +++ b/win32ss/gdi/eng/alphablend.c @@ -111,6 +111,7 @@ EngAlphaBlend( if (!IntEngEnter(&EnterLeaveDest, psoDest, &OutputRect, FALSE, &Translate, &OutputObj)) { + IntEngLeave(&EnterLeaveSource); return FALSE; } OutputRect.left += Translate.x;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2022