Ros-diffs June 2020

ros-diffs@reactos.org

20 participants
95 discussions

[reactos] 01/01: [NFSD] readdir_copy_shortname(): Add needed brackets to '*name_size_out' (#2856)
by Serge Gautherie 06 Jun '20

06 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e861d9759b39ac889b19… commit 1e861d9759b39ac889b19e97f56af7ac3d2dbc2f Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jun 6 18:21:05 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 6 18:21:05 2020 +0200 [NFSD] readdir_copy_shortname(): Add needed brackets to '*name_size_out' (#2856) CORE-17078 --- base/services/nfsd/readdir.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/base/services/nfsd/readdir.c b/base/services/nfsd/readdir.c index eaa9301e732..24833c3af16 100644 --- a/base/services/nfsd/readdir.c +++ b/base/services/nfsd/readdir.c @@ -165,7 +165,11 @@ static void readdir_copy_shortname( /* GetShortPathName returns number of characters, not including \0 */ *name_size_out = (CCHAR)GetShortPathNameW(name, name_out, 12); if (*name_size_out) { +#ifndef __REACTOS__ *name_size_out++; +#else + (*name_size_out)++; +#endif *name_size_out *= sizeof(WCHAR); } }

1 0

[reactos] 01/01: [APPHELP_APITEST] Properly handle a couple 'malloc()/free()' (#2898)
by Serge Gautherie 06 Jun '20

06 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7440eff8fb2092bea08d… commit e7440eff8fb2092bea08def0db7f6d196167e5a4 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jun 6 17:58:34 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 6 17:58:34 2020 +0200 [APPHELP_APITEST] Properly handle a couple 'malloc()/free()' (#2898) Detected by Cppcheck: memleak, redundantAssignment. Addendum to 78280ad2 (r71226). --- modules/rostests/apitests/apphelp/data.c | 12 ++++++++++-- modules/rostests/apitests/apphelp/layerapi.c | 16 +++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/modules/rostests/apitests/apphelp/data.c b/modules/rostests/apitests/apphelp/data.c index 95dd9216194..58278271848 100644 --- a/modules/rostests/apitests/apphelp/data.c +++ b/modules/rostests/apitests/apphelp/data.c @@ -469,15 +469,23 @@ void test_create_exe_imp(const WCHAR* name, int skip_rsrc_exports) HANDLE file; char *buf, *cur; DWORD size = 0x800; + buf = malloc(size); + winetest_ok(buf != NULL, "malloc failed\n"); + if (buf == NULL) + { + return; + } file = CreateFileW(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); winetest_ok(file != INVALID_HANDLE_VALUE, "can't create file\n"); - if(file == INVALID_HANDLE_VALUE) + if (file == INVALID_HANDLE_VALUE) + { + free(buf); return; + } memset(buf, 0, size); - cur = buf; cur = memcpy(buf, &dos_header, sizeof(dos_header)); cur += dos_header.e_lfanew; diff --git a/modules/rostests/apitests/apphelp/layerapi.c b/modules/rostests/apitests/apphelp/layerapi.c index 69306f220a9..72ccf9555c6 100644 --- a/modules/rostests/apitests/apphelp/layerapi.c +++ b/modules/rostests/apitests/apphelp/layerapi.c @@ -569,16 +569,26 @@ static BOOL create_file(LPCSTR dir, LPCSTR name, int filler, DWORD size) { char target[MAX_PATH], *tmp; HANDLE file; - PathCombineA(target, dir, name); tmp = malloc(size); - memset(tmp, filler, size); + if (tmp == NULL) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + PathCombineA(target, dir, name); file = CreateFileA(target, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(file == INVALID_HANDLE_VALUE) + if (file == INVALID_HANDLE_VALUE) + { + free(tmp); return FALSE; + } + memset(tmp, filler, size); WriteFile(file, tmp, size, &size, NULL); + CloseHandle(file); free(tmp); return TRUE;

1 0

[reactos] 01/01: [NTOSKRNL] Add 'DECLSPEC_NORETURN' to a few 'KeBugCheck*()' (#2896)
by Serge Gautherie 06 Jun '20

06 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3051eb0e48c0b8a122529… commit 3051eb0e48c0b8a1225296787e9825e6e71625b7 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jun 6 17:50:14 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 6 17:50:14 2020 +0200 [NTOSKRNL] Add 'DECLSPEC_NORETURN' to a few 'KeBugCheck*()' (#2896) --- boot/environ/lib/misc/rtlcompat.c | 1 + ntoskrnl/ke/bug.c | 3 +++ sdk/lib/cmlib/cmlib.h | 1 + sdk/tools/mkhive/rtl.c | 2 +- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/boot/environ/lib/misc/rtlcompat.c b/boot/environ/lib/misc/rtlcompat.c index 6f0c7bf7c0b..cdb516b4a89 100644 --- a/boot/environ/lib/misc/rtlcompat.c +++ b/boot/environ/lib/misc/rtlcompat.c @@ -102,6 +102,7 @@ DbgPrint ( return 0; } +// FIXME: DECLSPEC_NORETURN VOID NTAPI KeBugCheckEx( diff --git a/ntoskrnl/ke/bug.c b/ntoskrnl/ke/bug.c index 8b9f020a10f..5d5a4a7e2d4 100644 --- a/ntoskrnl/ke/bug.c +++ b/ntoskrnl/ke/bug.c @@ -706,6 +706,7 @@ KiDisplayBlueScreen(IN ULONG MessageId, } } +DECLSPEC_NORETURN VOID NTAPI KeBugCheckWithTf(IN ULONG BugCheckCode, @@ -1403,6 +1404,7 @@ KeDeregisterNmiCallback(IN PVOID Handle) /* * @implemented */ +DECLSPEC_NORETURN VOID NTAPI KeBugCheckEx(IN ULONG BugCheckCode, @@ -1423,6 +1425,7 @@ KeBugCheckEx(IN ULONG BugCheckCode, /* * @implemented */ +DECLSPEC_NORETURN VOID NTAPI KeBugCheck(ULONG BugCheckCode) diff --git a/sdk/lib/cmlib/cmlib.h b/sdk/lib/cmlib/cmlib.h index b9431c750b6..6755ac3ccf0 100644 --- a/sdk/lib/cmlib/cmlib.h +++ b/sdk/lib/cmlib/cmlib.h @@ -81,6 +81,7 @@ IN PCUNICODE_STRING String2, IN BOOLEAN CaseInSensitive); + // FIXME: DECLSPEC_NORETURN VOID NTAPI KeBugCheckEx( diff --git a/sdk/tools/mkhive/rtl.c b/sdk/tools/mkhive/rtl.c index c7979afc6a0..1f044d31761 100644 --- a/sdk/tools/mkhive/rtl.c +++ b/sdk/tools/mkhive/rtl.c @@ -155,7 +155,7 @@ RtlAssert(IN PVOID FailedAssertion, //DbgBreakPoint(); } -// DECLSPEC_NORETURN +// FIXME: DECLSPEC_NORETURN VOID NTAPI KeBugCheckEx(

1 0

[reactos] 01/01: [NTDLL_APITEST] Add NtSetInformationThread testcase (#2793)
by George Bișoc 06 Jun '20

06 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4acd8cc91ae6ed5ea219… commit d4acd8cc91ae6ed5ea21906af886f00ef32be328 Author: George Bișoc <fraizeraust99(a)gmail.com> AuthorDate: Sat Jun 6 17:48:39 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 6 17:48:39 2020 +0200 [NTDLL_APITEST] Add NtSetInformationThread testcase (#2793) --- modules/rostests/apitests/ntdll/CMakeLists.txt | 1 + .../apitests/ntdll/NtSetInformationThread.c | 100 +++++++++++++++++++++ modules/rostests/apitests/ntdll/testlist.c | 2 + 3 files changed, 103 insertions(+) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 6e25db84d12..a8a314ae62f 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -35,6 +35,7 @@ list(APPEND SOURCE NtSaveKey.c NtSetInformationFile.c NtSetInformationProcess.c + NtSetInformationThread.c NtSetValueKey.c NtSetVolumeInformationFile.c NtUnloadDriver.c diff --git a/modules/rostests/apitests/ntdll/NtSetInformationThread.c b/modules/rostests/apitests/ntdll/NtSetInformationThread.c new file mode 100644 index 00000000000..f1835ed5198 --- /dev/null +++ b/modules/rostests/apitests/ntdll/NtSetInformationThread.c @@ -0,0 +1,100 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for the NtSetInformationThread API + * COPYRIGHT: Copyright 2020 George Bișoc <george.bisoc(a)reactos.org> + */ + +#include "precomp.h" + +static +void +Test_ThreadPriorityClass(void) +{ + NTSTATUS Status; + KPRIORITY *Priority; + + Priority = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(KPRIORITY)); + if (Priority == NULL) + { + skip("Failed to allocate memory for thread priority variable!\n"); + return; + } + + /* Assign a priority */ + *Priority = 11; + + /* Everything is NULL */ + Status = NtSetInformationThread(NULL, + ThreadPriority, + NULL, + 0); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* Give an invalid thread handle */ + Status = NtSetInformationThread(NULL, + ThreadPriority, + Priority, + sizeof(KPRIORITY)); + ok_hex(Status, STATUS_INVALID_HANDLE); + + /* Don't set any priority to the thread */ + Status = NtSetInformationThread(GetCurrentThread(), + ThreadPriority, + NULL, + sizeof(KPRIORITY)); + ok_hex(Status, STATUS_ACCESS_VIOLATION); + + /* The information length is incorrect */ + Status = NtSetInformationThread(GetCurrentThread(), + ThreadPriority, + Priority, + 0); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* The buffer is misaligned and information length is incorrect */ + Status = NtSetInformationThread(GetCurrentThread(), + ThreadPriority, + (PVOID)1, + 0); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* The buffer is misaligned */ + Status = NtSetInformationThread(GetCurrentThread(), + ThreadPriority, + (PVOID)1, + sizeof(KPRIORITY)); + ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); + + /* The buffer is misaligned -- try with an alignment size of 2 */ + Status = NtSetInformationThread(GetCurrentThread(), + ThreadPriority, + (PVOID)2, + sizeof(KPRIORITY)); + ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); + + /* Set the priority to the current thread */ + Status = NtSetInformationThread(GetCurrentThread(), + ThreadPriority, + Priority, + sizeof(KPRIORITY)); + ok_hex(Status, STATUS_SUCCESS); + + /* + * Set the priority as LOW_REALTIME_PRIORITY, + * we don't have privileges to do so. + */ + *Priority = LOW_REALTIME_PRIORITY; + Status = NtSetInformationThread(GetCurrentThread(), + ThreadPriority, + Priority, + sizeof(KPRIORITY)); + ok_hex(Status, STATUS_PRIVILEGE_NOT_HELD); + + HeapFree(GetProcessHeap(), 0, Priority); +} + +START_TEST(NtSetInformationThread) +{ + Test_ThreadPriorityClass(); +} diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index 293a7cc45c5..40a0d686c8b 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -33,6 +33,7 @@ extern void func_NtReadFile(void); extern void func_NtSaveKey(void); extern void func_NtSetInformationFile(void); extern void func_NtSetInformationProcess(void); +extern void func_NtSetInformationThread(void); extern void func_NtSetValueKey(void); extern void func_NtSetVolumeInformationFile(void); extern void func_NtSystemInformation(void); @@ -106,6 +107,7 @@ const struct test winetest_testlist[] = { "NtSaveKey", func_NtSaveKey}, { "NtSetInformationFile", func_NtSetInformationFile }, { "NtSetInformationProcess", func_NtSetInformationProcess }, + { "NtSetInformationThread", func_NtSetInformationThread }, { "NtSetValueKey", func_NtSetValueKey}, { "NtSetVolumeInformationFile", func_NtSetVolumeInformationFile }, { "NtSystemInformation", func_NtSystemInformation },

1 0

[reactos] 01/01: [NTDLL_APITEST] Add ProcessBasePriority and ProcessRaisePriority classes unit tests (#2740)
by George Bișoc 06 Jun '20

06 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a7dd057ce2b622aa2d7aa… commit a7dd057ce2b622aa2d7aaf3abb993c9e50fb2dd3 Author: George Bișoc <fraizeraust99(a)gmail.com> AuthorDate: Sat Jun 6 17:47:38 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jun 6 17:47:38 2020 +0200 [NTDLL_APITEST] Add ProcessBasePriority and ProcessRaisePriority classes unit tests (#2740) ProcessRaisePriority expects a buffer input information argument of KPRIORITY type definition as shown in this documentation (see the PROCESS_INFORMATION_CLASS structure members list of classes). https://undocumented.ntinternals.net/index.html?page=UserMode%2FUndocumente… --- .../apitests/ntdll/NtSetInformationProcess.c | 143 +++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/modules/rostests/apitests/ntdll/NtSetInformationProcess.c b/modules/rostests/apitests/ntdll/NtSetInformationProcess.c index b5fcc18e2db..0b805b3ca66 100644 --- a/modules/rostests/apitests/ntdll/NtSetInformationProcess.c +++ b/modules/rostests/apitests/ntdll/NtSetInformationProcess.c @@ -7,6 +7,147 @@ #include "precomp.h" +static +void +Test_ProcBasePriorityClass(void) +{ + NTSTATUS Status; + + /* + * Assign a priority of HIGH_PRIORITY (see pstypes.h). + * The function will fail with a status of STATUS_PRIVILEGE_NOT_HELD + * as the process who executed the caller doesn't have the requested + * privileges to perform the operation. + */ + KPRIORITY BasePriority = HIGH_PRIORITY; + + /* Everything is NULL */ + Status = NtSetInformationProcess(NULL, + ProcessBasePriority, + NULL, + 0); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* Set the base priority to an invalid process handle */ + Status = NtSetInformationProcess(NULL, + ProcessBasePriority, + &BasePriority, + sizeof(KPRIORITY)); + ok_hex(Status, STATUS_INVALID_HANDLE); + + /* Don't input anything to the caller but the length information is valid */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessBasePriority, + NULL, + sizeof(KPRIORITY)); + ok_hex(Status, STATUS_ACCESS_VIOLATION); + + /* Give the base priority input to the caller but length is invalid */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessBasePriority, + &BasePriority, + 0); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* The input buffer is misaligned and length information invalid */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessBasePriority, + (PVOID)1, + 0); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* The input buffer is misaligned */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessBasePriority, + (PVOID)1, + sizeof(KPRIORITY)); + ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); + + /* The input buffer is misaligned (try with an alignment of 2) */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessBasePriority, + (PVOID)2, + sizeof(KPRIORITY)); + ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); + + /* Set the base priority but we have lack privileges to do so */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessBasePriority, + &BasePriority, + sizeof(KPRIORITY)); + ok_hex(Status, STATUS_PRIVILEGE_NOT_HELD); + + /* + * Assign a random priority value this time and + * set the base priority to the current process. + */ + BasePriority = 8; + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessBasePriority, + &BasePriority, + sizeof(KPRIORITY)); + ok_hex(Status, STATUS_SUCCESS); +} + +static +void +Test_ProcRaisePriorityClass(void) +{ + NTSTATUS Status; + + /* Raise the priority as much as possible */ + ULONG RaisePriority = MAXIMUM_PRIORITY; + + /* Everything is NULL */ + Status = NtSetInformationProcess(NULL, + ProcessRaisePriority, + NULL, + 0); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* A invalid handle to process is given */ + Status = NtSetInformationProcess(NULL, + ProcessRaisePriority, + &RaisePriority, + sizeof(ULONG)); + ok_hex(Status, STATUS_INVALID_HANDLE); + + /* The input buffer is misaligned and length information invalid */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessRaisePriority, + (PVOID)1, + 0); + ok_hex(Status, STATUS_INFO_LENGTH_MISMATCH); + + /* A NULL buffer has been accessed */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessRaisePriority, + NULL, + sizeof(ULONG)); + ok_hex(Status, STATUS_ACCESS_VIOLATION); + + /* The input buffer is misaligned */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessRaisePriority, + (PVOID)1, + sizeof(ULONG)); + ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); + + /* The input buffer is misaligned -- try with an alignment size of 2 */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessRaisePriority, + (PVOID)2, + sizeof(ULONG)); + ok_hex(Status, STATUS_DATATYPE_MISALIGNMENT); + + /* Raise the priority of the given current process */ + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessRaisePriority, + &RaisePriority, + sizeof(ULONG)); + ok_hex(Status, STATUS_SUCCESS); +} + static void Test_ProcForegroundBackgroundClass(void) @@ -77,4 +218,6 @@ Test_ProcForegroundBackgroundClass(void) START_TEST(NtSetInformationProcess) { Test_ProcForegroundBackgroundClass(); + Test_ProcBasePriorityClass(); + Test_ProcRaisePriorityClass(); }

1 0

[reactos] 03/03: [NTOS:KE] Save ExceptionList in the assembly version of KiEnterTrap. CORE-15723
by Thomas Faber 06 Jun '20

06 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f49a9c792b8334a5ad8d… commit 4f49a9c792b8334a5ad8d6daaecd26dde6870f3c Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri May 22 22:34:56 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jun 6 08:44:30 2020 +0200 [NTOS:KE] Save ExceptionList in the assembly version of KiEnterTrap. CORE-15723 If SEH is used in a C trap handler, the exception frame will be registered before the call to KiEnterTrap, which means we save the wrong trap handler. We'll therefore also restore this wrong frame for the excepting code, resulting in a stale SEH chain. We avoid this problem by saving the handler in the assembly trap entry code instead of from C. While SEH in a C trap handler should now theoretically be safe, we still forbid it through asserts in the C KiEnterTrap variants to make any potential future problems more obvious. Should this functionality be needed at some point and deemed safe, these asserts can then be removed. --- ntoskrnl/include/internal/i386/asmmacro.S | 4 ++++ ntoskrnl/include/internal/i386/trap_x.h | 24 ++++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ntoskrnl/include/internal/i386/asmmacro.S b/ntoskrnl/include/internal/i386/asmmacro.S index f7af217cc9f..543ce3f1bc4 100644 --- a/ntoskrnl/include/internal/i386/asmmacro.S +++ b/ntoskrnl/include/internal/i386/asmmacro.S @@ -207,6 +207,10 @@ set_sane_segs: mov fs, ax endif + /* Save ExceptionList, since the C handler might use SEH */ + mov eax, fs:[KPCR_EXCEPTION_LIST] + mov [esp + KTRAP_FRAME_EXCEPTION_LIST], eax + #if DBG /* Keep the frame chain intact */ mov eax, [esp + KTRAP_FRAME_EIP] diff --git a/ntoskrnl/include/internal/i386/trap_x.h b/ntoskrnl/include/internal/i386/trap_x.h index 06443c9dc90..cd79c2a40c4 100644 --- a/ntoskrnl/include/internal/i386/trap_x.h +++ b/ntoskrnl/include/internal/i386/trap_x.h @@ -349,8 +349,12 @@ FORCEINLINE VOID KiEnterV86Trap(IN PKTRAP_FRAME TrapFrame) { - /* Save exception list */ - TrapFrame->ExceptionList = KeGetPcr()->NtTib.ExceptionList; + PVOID ExceptionList; + + /* Check exception list */ + ExceptionList = KeGetPcr()->NtTib.ExceptionList; + ASSERTMSG("V86 trap handler must not register an SEH frame\n", + ExceptionList == TrapFrame->ExceptionList); /* Save DR7 and check for debugging */ TrapFrame->Dr7 = __readdr(7); @@ -368,8 +372,12 @@ FORCEINLINE VOID KiEnterInterruptTrap(IN PKTRAP_FRAME TrapFrame) { - /* Save exception list and terminate it */ - TrapFrame->ExceptionList = KeGetPcr()->NtTib.ExceptionList; + PVOID ExceptionList; + + /* Check exception list and terminate it */ + ExceptionList = KeGetPcr()->NtTib.ExceptionList; + ASSERTMSG("Interrupt handler must not register an SEH frame\n", + ExceptionList == TrapFrame->ExceptionList); KeGetPcr()->NtTib.ExceptionList = EXCEPTION_CHAIN_END; /* Default to debugging disabled */ @@ -398,8 +406,12 @@ FORCEINLINE VOID KiEnterTrap(IN PKTRAP_FRAME TrapFrame) { - /* Save exception list */ - TrapFrame->ExceptionList = KeGetPcr()->NtTib.ExceptionList; + PVOID ExceptionList; + + /* Check exception list */ + ExceptionList = KeGetPcr()->NtTib.ExceptionList; + ASSERTMSG("Trap handler must not register an SEH frame\n", + ExceptionList == TrapFrame->ExceptionList); /* Default to debugging disabled */ TrapFrame->Dr7 = 0;

1 0

[reactos] 02/03: [NTOS:KE] Split KiCheckForSListFault into its own function. CORE-15723
by Thomas Faber 06 Jun '20

06 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d40ff3ca985daf8ea9927… commit d40ff3ca985daf8ea9927d9902282f6aa813824b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri May 22 11:18:39 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jun 6 08:42:22 2020 +0200 [NTOS:KE] Split KiCheckForSListFault into its own function. CORE-15723 This avoids SEH in a trap handler. See the following commit for more details. --- ntoskrnl/ke/i386/traphdlr.c | 114 ++++++++++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 52 deletions(-) diff --git a/ntoskrnl/ke/i386/traphdlr.c b/ntoskrnl/ke/i386/traphdlr.c index 8ef4031b601..0614efc398b 100644 --- a/ntoskrnl/ke/i386/traphdlr.c +++ b/ntoskrnl/ke/i386/traphdlr.c @@ -1216,56 +1216,11 @@ KiTrap0DHandler(IN PKTRAP_FRAME TrapFrame) KiTrapReturn(TrapFrame); } -DECLSPEC_NORETURN -VOID +BOOLEAN FASTCALL -KiTrap0EHandler(IN PKTRAP_FRAME TrapFrame) +KiCheckForSListFault(PKTRAP_FRAME TrapFrame) { - PKTHREAD Thread; - BOOLEAN StoreInstruction; - ULONG_PTR Cr2; - NTSTATUS Status; - - /* Save trap frame */ - KiEnterTrap(TrapFrame); - - /* Check if this is the base frame */ - Thread = KeGetCurrentThread(); - if (KeGetTrapFrame(Thread) != TrapFrame) - { - /* It isn't, check if this is a second nested frame */ - if (((ULONG_PTR)KeGetTrapFrame(Thread) - (ULONG_PTR)TrapFrame) <= - FIELD_OFFSET(KTRAP_FRAME, EFlags)) - { - /* The stack is somewhere in between frames, we need to fix it */ - UNIMPLEMENTED_FATAL(); - } - } - - /* Save CR2 */ - Cr2 = __readcr2(); - - /* Enable interrupts */ - _enable(); - - /* Interpret the error code */ - StoreInstruction = (TrapFrame->ErrCode & 2) != 0; - - /* Check if we came in with interrupts disabled */ - if (!(TrapFrame->EFlags & EFLAGS_INTERRUPT_MASK)) - { - /* This is completely illegal, bugcheck the system */ - KeBugCheckWithTf(IRQL_NOT_LESS_OR_EQUAL, - Cr2, - (ULONG_PTR)-1, - TrapFrame->ErrCode, - TrapFrame->Eip, - TrapFrame); - } - - /* Check for S-List fault - - Explanation: An S-List fault can occur due to a race condition between 2 + /* Explanation: An S-List fault can occur due to a race condition between 2 threads simultaneously trying to pop an element from the S-List. After thread 1 has read the pointer to the top element on the S-List it is preempted and thread 2 calls InterlockedPopEntrySlist on the same S-List, @@ -1329,7 +1284,7 @@ KiTrap0EHandler(IN PKTRAP_FRAME TrapFrame) _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* The S-List pointer is not valid! */ - goto NotSListFault; + return FALSE; } _SEH2_END; ResumeAddress = KeUserPopEntrySListResume; @@ -1353,11 +1308,66 @@ KiTrap0EHandler(IN PKTRAP_FRAME TrapFrame) /* Restart the operation */ TrapFrame->Eip = (ULONG_PTR)ResumeAddress; - /* Continue execution */ - KiEoiHelper(TrapFrame); + return TRUE; } } -NotSListFault: + + return FALSE; +} + +DECLSPEC_NORETURN +VOID +FASTCALL +KiTrap0EHandler(IN PKTRAP_FRAME TrapFrame) +{ + PKTHREAD Thread; + BOOLEAN StoreInstruction; + ULONG_PTR Cr2; + NTSTATUS Status; + + /* Save trap frame */ + KiEnterTrap(TrapFrame); + + /* Check if this is the base frame */ + Thread = KeGetCurrentThread(); + if (KeGetTrapFrame(Thread) != TrapFrame) + { + /* It isn't, check if this is a second nested frame */ + if (((ULONG_PTR)KeGetTrapFrame(Thread) - (ULONG_PTR)TrapFrame) <= + FIELD_OFFSET(KTRAP_FRAME, EFlags)) + { + /* The stack is somewhere in between frames, we need to fix it */ + UNIMPLEMENTED_FATAL(); + } + } + + /* Save CR2 */ + Cr2 = __readcr2(); + + /* Enable interrupts */ + _enable(); + + /* Interpret the error code */ + StoreInstruction = (TrapFrame->ErrCode & 2) != 0; + + /* Check if we came in with interrupts disabled */ + if (!(TrapFrame->EFlags & EFLAGS_INTERRUPT_MASK)) + { + /* This is completely illegal, bugcheck the system */ + KeBugCheckWithTf(IRQL_NOT_LESS_OR_EQUAL, + Cr2, + (ULONG_PTR)-1, + TrapFrame->ErrCode, + TrapFrame->Eip, + TrapFrame); + } + + /* Check for S-List fault */ + if (KiCheckForSListFault(TrapFrame)) + { + /* Continue execution */ + KiEoiHelper(TrapFrame); + } /* Call the access fault handler */ Status = MmAccessFault(TrapFrame->ErrCode,

1 0

[reactos] 01/03: [RTL] Add FPO information to RtlpExecuteHandler. CORE-15723
by Thomas Faber 06 Jun '20

06 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4dedc8ff52e772b547502… commit 4dedc8ff52e772b5475020424c42125d1337d03a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri May 22 09:22:39 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Jun 6 08:40:20 2020 +0200 [RTL] Add FPO information to RtlpExecuteHandler. CORE-15723 --- sdk/lib/rtl/i386/except_asm.s | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/lib/rtl/i386/except_asm.s b/sdk/lib/rtl/i386/except_asm.s index 7c23858329f..bd8d2ec3236 100644 --- a/sdk/lib/rtl/i386/except_asm.s +++ b/sdk/lib/rtl/i386/except_asm.s @@ -128,7 +128,8 @@ _RtlpExecuteHandlerForUnwind@20: mov edx, offset _RtlpUnwindProtector -_RtlpExecuteHandler@20: +.PROC _RtlpExecuteHandler@20 + FPO 0, 0, 0, 0, 0, FRAME_FPO /* Save non-volatile */ push ebx @@ -155,6 +156,7 @@ _RtlpExecuteHandler@20: pop ebx ret 20 +.ENDP PUBLIC _RtlpExecuteHandler2@20 _RtlpExecuteHandler2@20:

1 0

[reactos] 01/01: [CDMAKE] Add 'DECLSPEC_NORETURN' to 'error_exit()' (#2893)
by Serge Gautherie 05 Jun '20

05 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d88487cd18058baad119… commit 5d88487cd18058baad1199277777e148c8a1081a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Jun 5 13:57:49 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jun 5 13:57:49 2020 +0200 [CDMAKE] Add 'DECLSPEC_NORETURN' to 'error_exit()' (#2893) Detected by Cppcheck: doubleFree. --- modules/rosapps/applications/devutils/cdmake/cdmake.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/rosapps/applications/devutils/cdmake/cdmake.c b/modules/rosapps/applications/devutils/cdmake/cdmake.c index d02ccc6ef55..dd05ed51ec6 100644 --- a/modules/rosapps/applications/devutils/cdmake/cdmake.c +++ b/modules/rosapps/applications/devutils/cdmake/cdmake.c @@ -312,7 +312,9 @@ This function edits and displays an error message and then jumps back to the error exit point in main(). -----------------------------------------------------------------------------*/ -static void error_exit(const char* fmt, ...) +static +DECLSPEC_NORETURN +void error_exit(const char* fmt, ...) { va_list arg;

1 0

[reactos] 01/01: [SDK:RTL] RtlValidAcl(): Improve ACL error messages (#2833)
by Serge Gautherie 04 Jun '20

04 Jun '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6808e40b3b5ba2883305c… commit 6808e40b3b5ba2883305c1b04196c6314be51e0a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Jun 4 23:20:20 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Jun 5 00:20:20 2020 +0300 [SDK:RTL] RtlValidAcl(): Improve ACL error messages (#2833) CORE-11506 --- sdk/lib/rtl/acl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/lib/rtl/acl.c b/sdk/lib/rtl/acl.c index 18fb3a623b3..e7fa8e3c7cf 100644 --- a/sdk/lib/rtl/acl.c +++ b/sdk/lib/rtl/acl.c @@ -847,21 +847,21 @@ RtlValidAcl(IN PACL Acl) if ((Acl->AclRevision < MIN_ACL_REVISION) || (Acl->AclRevision > MAX_ACL_REVISION)) { - DPRINT1("Invalid ACL revision\n"); + DPRINT1("Invalid ACL revision: %u\n", Acl->AclRevision); _SEH2_YIELD(return FALSE); } /* Next, validate that the ACL is USHORT-aligned */ if (ROUND_DOWN(Acl->AclSize, sizeof(USHORT)) != Acl->AclSize) { - DPRINT1("Invalid ACL size\n"); + DPRINT1("Misaligned ACL size: %u\n", Acl->AclSize); _SEH2_YIELD(return FALSE); } /* And that it's big enough */ if (Acl->AclSize < sizeof(ACL)) { - DPRINT1("Invalid ACL size\n"); + DPRINT1("Too small ACL size: %u\n", Acl->AclSize); _SEH2_YIELD(return FALSE); }

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2020