May 2022 - Wine-commits - list.winehq.org

Jinoh Kang : ntdll/tests: Add tests for __fastfail().
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: 7fbe8b8ebfa0d13dd318fd1d3beaf04872a47ed0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fbe8b8ebfa0d13dd318fd1d… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Dec 8 03:14:06 2021 +0900 ntdll/tests: Add tests for __fastfail(). Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/tests/exception.c | 93 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 14ffdb00d78..0086b18d678 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8417,6 +8417,91 @@ static void test_ripevent(DWORD numexc) pRtlRemoveVectoredExceptionHandler(vectored_handler); } +static void subtest_fastfail(unsigned int code) +{ + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + DEBUG_EVENT de; + DWORD continuestatus; + BOOL ret; + BOOL had_ff = FALSE, had_se = FALSE; + + sprintf(cmdline, "%s %s %s %u", my_argv[0], my_argv[1], "fastfail", code); + si.cb = sizeof(si); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, DEBUG_PROCESS, NULL, NULL, &si, &pi); + ok(ret, "could not create child process error: %lu\n", GetLastError()); + if (!ret) + return; + + do + { + continuestatus = DBG_CONTINUE; + ok(WaitForDebugEvent(&de, INFINITE), "reading debug event\n"); + + if (de.dwDebugEventCode == EXCEPTION_DEBUG_EVENT) + { + if (de.u.Exception.ExceptionRecord.ExceptionCode == STATUS_STACK_BUFFER_OVERRUN) + { + ok(!de.u.Exception.dwFirstChance, "must be a second chance exception\n"); + ok(de.u.Exception.ExceptionRecord.NumberParameters == 1, "expected exactly one parameter, got %lu\n", + de.u.Exception.ExceptionRecord.NumberParameters); + ok(de.u.Exception.ExceptionRecord.ExceptionInformation[0] == code, "expected %u for code, got %Iu\n", + code, de.u.Exception.ExceptionRecord.ExceptionInformation[0]); + had_ff = TRUE; + } + + if (de.u.Exception.dwFirstChance) + { + continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } + else + { + had_se = TRUE; + pNtTerminateProcess(pi.hProcess, 0); + } + } + + ContinueDebugEvent(de.dwProcessId, de.dwThreadId, continuestatus); + + } while (de.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT); + + todo_wine + ok(had_ff || broken(had_se) /* Win7 */, "fast fail did not occur\n"); + + wait_child_process( pi.hProcess ); + ret = CloseHandle(pi.hThread); + ok(ret, "error %lu\n", GetLastError()); + ret = CloseHandle(pi.hProcess); + ok(ret, "error %lu\n", GetLastError()); + + return; +} + +static void test_fastfail(void) +{ + unsigned int codes[] = { + FAST_FAIL_LEGACY_GS_VIOLATION, + FAST_FAIL_VTGUARD_CHECK_FAILURE, + FAST_FAIL_STACK_COOKIE_CHECK_FAILURE, + FAST_FAIL_CORRUPT_LIST_ENTRY, + FAST_FAIL_INCORRECT_STACK, + FAST_FAIL_INVALID_ARG, + FAST_FAIL_GS_COOKIE_INIT, + FAST_FAIL_FATAL_APP_EXIT, + FAST_FAIL_INVALID_FAST_FAIL_CODE, + 0xdeadbeefUL, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(codes); i++) + { + winetest_push_context("__fastfail(%#x)", codes[i]); + subtest_fastfail(codes[i]); + winetest_pop_context(); + } +} + static DWORD breakpoint_exceptions; static LONG CALLBACK breakpoint_handler(EXCEPTION_POINTERS *ExceptionInfo) @@ -10664,6 +10749,13 @@ START_TEST(exception) if (my_argc >= 4) { void *addr; + + if (strcmp(my_argv[2], "fastfail") == 0) + { + __fastfail(strtoul(my_argv[3], NULL, 0)); + return; + } + sscanf( my_argv[3], "%p", &addr ); if (addr != &test_stage) @@ -10811,6 +10903,7 @@ START_TEST(exception) test_thread_context(); test_outputdebugstring(1, FALSE); test_ripevent(1); + test_fastfail(); test_breakpoint(1); test_closehandle(0, (HANDLE)0xdeadbeef); /* Call of Duty WWII writes to BeingDebugged then closes an invalid handle,

1 0

Jinoh Kang : ntdll: Implement __fastfail().
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: c4c9a6951be4299850ca220450b21eeb8843fde5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4c9a6951be4299850ca2204… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Dec 5 19:56:22 2021 +0900 ntdll: Implement __fastfail(). __fastfail() is used by the Visual C++ runtime and Windows system libraries to signal that the in-process state is corrupted and unrecoverable. If __fastfail() is invoked, the NT kernel raises a second-chance non-continuable exception STATUS_STACK_BUFFER_OVERRUN. This quickly terminates the process, bypassing all in-process exception handlers (since they all rely on the potentially corrupted process state). Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/tests/exception.c | 1 - dlls/ntdll/unix/signal_arm.c | 19 +++++++++++++++++-- dlls/ntdll/unix/signal_arm64.c | 16 ++++++++++++++++ dlls/ntdll/unix/signal_i386.c | 8 ++++++++ dlls/ntdll/unix/signal_x86_64.c | 8 ++++++++ 5 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0086b18d678..3e76b001147 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8466,7 +8466,6 @@ static void subtest_fastfail(unsigned int code) } while (de.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT); - todo_wine ok(had_ff || broken(had_se) /* Win7 */, "fast fail did not occur\n"); wait_child_process( pi.hProcess ); diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 1fea76f6563..ead14303436 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -812,13 +812,28 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) switch (get_trap_code(signal, context)) { case TRAP_ARM_PRIVINFLT: /* Invalid opcode exception */ - if (*(WORD *)PC_sig(context) == 0xdefe) /* breakpoint */ + switch (*(WORD *)PC_sig(context)) { + case 0xdefb: /* __fastfail */ + { + CONTEXT ctx; + save_context( &ctx, sigcontext ); + rec.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; + rec.ExceptionAddress = (void *)ctx.Pc; + rec.ExceptionFlags = EH_NONCONTINUABLE; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = ctx.R0; + NtRaiseException( &rec, &ctx, FALSE ); + return; + } + case 0xdefe: /* breakpoint */ rec.ExceptionCode = EXCEPTION_BREAKPOINT; rec.NumberParameters = 1; break; + default: + rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; + break; } - rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; case TRAP_ARM_PAGEFLT: /* Page fault */ rec.NumberParameters = 2; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 1df97f16f13..45cb3d1bf13 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -908,6 +908,7 @@ static void bus_handler( int signal, siginfo_t *siginfo, void *sigcontext ) static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; + ucontext_t *context = sigcontext; switch (siginfo->si_code) { @@ -916,6 +917,21 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; case TRAP_BRKPT: default: + /* debug exceptions do not update ESR on Linux, so we fetch the instruction directly. */ + if (!(PSTATE_sig( context ) & 0x10) && /* AArch64 (not WoW) */ + !(PC_sig( context ) & 3) && + *(ULONG *)PC_sig( context ) == 0xd43e0060UL) /* brk #0xf003 -> __fastfail */ + { + CONTEXT ctx; + save_context( &ctx, sigcontext ); + rec.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; + rec.ExceptionAddress = (void *)ctx.Pc; + rec.ExceptionFlags = EH_NONCONTINUABLE; + rec.NumberParameters = 1; + rec.ExceptionInformation[0] = ctx.u.X[0]; + NtRaiseException( &rec, &ctx, FALSE ); + return; + } rec.ExceptionCode = EXCEPTION_BREAKPOINT; rec.NumberParameters = 1; break; diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index e2a6148d609..7be0c39c424 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1676,6 +1676,14 @@ static BOOL handle_interrupt( unsigned int interrupt, ucontext_t *sigcontext, vo switch(interrupt) { + case 0x29: + /* __fastfail: process state is corrupted */ + rec->ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; + rec->ExceptionFlags = EH_NONCONTINUABLE; + rec->NumberParameters = 1; + rec->ExceptionInformation[0] = context->Ecx; + NtRaiseException( rec, context, FALSE ); + return TRUE; case 0x2d: if (!is_wow64) { diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index e3179e2f1b0..6c87e347eac 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2486,6 +2486,14 @@ static inline BOOL handle_interrupt( ucontext_t *sigcontext, EXCEPTION_RECORD *r switch (ERROR_sig(sigcontext) >> 3) { + case 0x29: + /* __fastfail: process state is corrupted */ + rec->ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; + rec->ExceptionFlags = EH_NONCONTINUABLE; + rec->NumberParameters = 1; + rec->ExceptionInformation[0] = context->Rcx; + NtRaiseException( rec, context, FALSE ); + return TRUE; case 0x2c: rec->ExceptionCode = STATUS_ASSERTION_FAILURE; break;

1 0

Jinoh Kang : ntdll: Properly parse UDF instruction in ARM.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: e2412025b20e63f8fcad3467c0ffcd7235f3d991 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2412025b20e63f8fcad3467… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Dec 5 19:57:16 2021 +0900 ntdll: Properly parse UDF instruction in ARM. Today, the UDF instruction handler code assumes Thumb mode code, and cannot recognise the UDF.W form or equivalent instructions in ARM mode encoding. Fix this by generalising the UDF instruction parser code. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_arm.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index ead14303436..c8edf22b170 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -360,6 +360,35 @@ static inline WORD get_error_code( const ucontext_t *sigcontext ) } +/*********************************************************************** + * get_udf_immediate + * + * Get the immediate operand if the PC is at a UDF instruction. + */ +static inline int get_udf_immediate( const ucontext_t *sigcontext ) +{ + if (CPSR_sig(sigcontext) & 0x20) + { + WORD thumb_insn = *(WORD *)PC_sig(sigcontext); + if ((thumb_insn >> 8) == 0xde) return thumb_insn & 0xff; + if ((thumb_insn & 0xfff0) == 0xf7f0) /* udf.w */ + { + WORD ext = *(WORD *)(PC_sig(sigcontext) + 2); + if ((ext & 0xf000) == 0xa000) return ((thumb_insn & 0xf) << 12) | (ext & 0x0fff); + } + } + else + { + DWORD arm_insn = *(DWORD *)PC_sig(sigcontext); + if ((arm_insn & 0xfff000f0) == 0xe7f000f0) + { + return ((arm_insn >> 4) & 0xfff0) | (arm_insn & 0xf); + } + } + return -1; +} + + /*********************************************************************** * save_context * @@ -812,9 +841,9 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) switch (get_trap_code(signal, context)) { case TRAP_ARM_PRIVINFLT: /* Invalid opcode exception */ - switch (*(WORD *)PC_sig(context)) + switch (get_udf_immediate( context )) { - case 0xdefb: /* __fastfail */ + case 0xfb: /* __fastfail */ { CONTEXT ctx; save_context( &ctx, sigcontext ); @@ -826,7 +855,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) NtRaiseException( &rec, &ctx, FALSE ); return; } - case 0xdefe: /* breakpoint */ + case 0xfe: /* breakpoint */ rec.ExceptionCode = EXCEPTION_BREAKPOINT; rec.NumberParameters = 1; break;

1 0

Rémi Bernon : ntdll: Fix handling of back pointer in heap_set_debug_flags.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: 75f2af284f160985d95d427dbb9ee2026b5ef1f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75f2af284f160985d95d427d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 30 15:14:02 2022 +0200 ntdll: Fix handling of back pointer in heap_set_debug_flags. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 16abc158e55..7697b8f0354 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1337,8 +1337,9 @@ static void heap_set_debug_flags( HANDLE handle ) if (block_get_flags( block ) & BLOCK_FLAG_FREE) { char *data = (char *)block + block_get_overhead( block ), *end = (char *)block + block_get_size( block ); - if (end >= commit_end) mark_block_free( data, commit_end - data, flags ); - else mark_block_free( data, end - sizeof(struct block *) - data, flags ); + if (next_block( subheap, block )) end -= sizeof(struct block *); + if (end > commit_end) mark_block_free( data, commit_end - data, flags ); + else mark_block_free( data, end - data, flags ); } else {

1 0

Rémi Bernon : ntdll: Split valgrind memory access control to separate helpers.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: e4e8cabf2f71f2e5a6d80101060ed7a9022a00ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e8cabf2f71f2e5a6d80101… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 30 20:44:59 2022 +0200 ntdll: Split valgrind memory access control to separate helpers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 62 +++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 7697b8f0354..f9cdb6d8c26 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -307,54 +307,56 @@ static inline BOOL check_subheap( const SUBHEAP *subheap ) static BOOL heap_validate( const HEAP *heap ); -/* mark a block of memory as free for debugging purposes */ -static inline void mark_block_free( void *ptr, SIZE_T size, DWORD flags ) +/* mark a block of memory as innacessible for debugging purposes */ +static inline void valgrind_make_noaccess( void const *ptr, SIZE_T size ) { - if (flags & HEAP_FREE_CHECKING_ENABLED) - { - SIZE_T i; - for (i = 0; i < size / sizeof(DWORD); i++) ((DWORD *)ptr)[i] = ARENA_FREE_FILLER; - } #if defined(VALGRIND_MAKE_MEM_NOACCESS) - VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size )); -#elif defined( VALGRIND_MAKE_NOACCESS) - VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size )); + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size ) ); +#elif defined(VALGRIND_MAKE_NOACCESS) + VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size ) ); #endif } /* mark a block of memory as initialized for debugging purposes */ -static inline void mark_block_initialized( void *ptr, SIZE_T size ) +static inline void valgrind_make_readable( void const *ptr, SIZE_T size ) { #if defined(VALGRIND_MAKE_MEM_DEFINED) - VALGRIND_DISCARD( VALGRIND_MAKE_MEM_DEFINED( ptr, size )); + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_DEFINED( ptr, size ) ); #elif defined(VALGRIND_MAKE_READABLE) - VALGRIND_DISCARD( VALGRIND_MAKE_READABLE( ptr, size )); + VALGRIND_DISCARD( VALGRIND_MAKE_READABLE( ptr, size ) ); #endif } /* mark a block of memory as uninitialized for debugging purposes */ -static inline void mark_block_uninitialized( void *ptr, SIZE_T size ) +static inline void valgrind_make_writable( void const *ptr, SIZE_T size ) { #if defined(VALGRIND_MAKE_MEM_UNDEFINED) - VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size )); + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size ) ); #elif defined(VALGRIND_MAKE_WRITABLE) - VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); + VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size ) ); #endif } +/* mark a block of memory as free for debugging purposes */ +static inline void mark_block_free( void *ptr, SIZE_T size, DWORD flags ) +{ + if (flags & HEAP_FREE_CHECKING_ENABLED) + { + SIZE_T i; + for (i = 0; i < size / sizeof(DWORD); i++) ((DWORD *)ptr)[i] = ARENA_FREE_FILLER; + } + valgrind_make_noaccess( ptr, size ); +} + /* mark a block of memory as a tail block */ static inline void mark_block_tail( void *ptr, SIZE_T size, DWORD flags ) { if (flags & HEAP_TAIL_CHECKING_ENABLED) { - mark_block_uninitialized( ptr, size ); + valgrind_make_writable( ptr, size ); memset( ptr, ARENA_TAIL_FILLER, size ); } -#if defined(VALGRIND_MAKE_MEM_NOACCESS) - VALGRIND_DISCARD( VALGRIND_MAKE_MEM_NOACCESS( ptr, size )); -#elif defined( VALGRIND_MAKE_NOACCESS) - VALGRIND_DISCARD( VALGRIND_MAKE_NOACCESS( ptr, size )); -#endif + valgrind_make_noaccess( ptr, size ); } /* initialize contents of a newly created block of memory */ @@ -362,17 +364,13 @@ static inline void initialize_block( void *ptr, SIZE_T size, SIZE_T unused, DWOR { if (flags & HEAP_ZERO_MEMORY) { - mark_block_initialized( ptr, size ); + valgrind_make_writable( ptr, size ); memset( ptr, 0, size ); } - else + else if (flags & HEAP_FREE_CHECKING_ENABLED) { - mark_block_uninitialized( ptr, size ); - if (flags & HEAP_FREE_CHECKING_ENABLED) - { - memset( ptr, ARENA_INUSE_FILLER, size ); - mark_block_uninitialized( ptr, size ); - } + valgrind_make_writable( ptr, size ); + memset( ptr, ARENA_INUSE_FILLER, size ); } mark_block_tail( (char *)ptr + size, unused, flags ); @@ -679,7 +677,7 @@ static void create_free_block( SUBHEAP *subheap, struct block *block, SIZE_T blo DWORD flags = heap->flags; struct block *next; - mark_block_uninitialized( block, sizeof(*entry) ); + valgrind_make_writable( block, sizeof(*entry) ); block_set_type( block, ARENA_FREE_MAGIC ); block_set_size( block, BLOCK_FLAG_FREE, block_size ); @@ -702,7 +700,7 @@ static void create_free_block( SUBHEAP *subheap, struct block *block, SIZE_T blo { /* set the next block PREV_FREE flag and back pointer */ block_set_size( next, BLOCK_FLAG_PREV_FREE, block_get_size( next ) ); - mark_block_initialized( (struct block **)next - 1, sizeof(struct block *) ); + valgrind_make_writable( (struct block **)next - 1, sizeof(struct block *) ); *((struct block **)next - 1) = block; }

1 0

Rémi Bernon : ntdll: Correctly free pending pointer in RtlDestroyHeap.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: 3f52b3a7413e9e0e9a29dd57c24bc66569690fca URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f52b3a7413e9e0e9a29dd57… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 30 19:57:55 2022 +0200 ntdll: Correctly free pending pointer in RtlDestroyHeap. It's allocated from the heap itself, should be freed even for the main process heap, and before destroying the CS or notifying valgrind of used block being freed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index f9cdb6d8c26..57ceff9cdd1 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1431,6 +1431,7 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) HEAP *heapPtr = HEAP_GetPtr( heap ); SUBHEAP *subheap, *next; ARENA_LARGE *arena, *arena_next; + struct block **pending, **tmp; SIZE_T size; void *addr; @@ -1443,6 +1444,15 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) } if (!heapPtr) return heap; + if ((pending = heapPtr->pending_free)) + { + heapPtr->pending_free = NULL; + for (tmp = pending; *tmp && tmp != pending + MAX_FREE_PENDING; ++tmp) + if ((subheap = find_subheap( heap, *tmp, FALSE ))) + free_used_block( subheap, *tmp ); + RtlFreeHeap( heap, 0, pending ); + } + if (heap == processHeap) return heap; /* cannot delete the main process heap */ /* remove it from the per-process list */ @@ -1470,7 +1480,6 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } notify_free_all( &heapPtr->subheap ); - RtlFreeHeap( GetProcessHeap(), 0, heapPtr->pending_free ); size = 0; addr = heap; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE );

1 0

Rémi Bernon : ntdll: Call valgrind alloc notifications at the topmost level.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: 0b4266c7a482ea45781135e57b08cecef095a97c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b4266c7a482ea45781135e5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 31 11:12:04 2022 +0200 ntdll: Call valgrind alloc notifications at the topmost level. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 57ceff9cdd1..4050c00c265 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -377,7 +377,7 @@ static inline void initialize_block( void *ptr, SIZE_T size, SIZE_T unused, DWOR } /* notify that a new block of memory has been allocated for debugging purposes */ -static inline void notify_alloc( void *ptr, SIZE_T size, BOOL init ) +static inline void valgrind_notify_alloc( void const *ptr, SIZE_T size, BOOL init ) { #ifdef VALGRIND_MALLOCLIKE_BLOCK VALGRIND_MALLOCLIKE_BLOCK( ptr, size, 0, init ); @@ -385,14 +385,14 @@ static inline void notify_alloc( void *ptr, SIZE_T size, BOOL init ) } /* notify that a block of memory has been freed for debugging purposes */ -static inline void notify_free( void const *ptr ) +static inline void valgrind_notify_free( void const *ptr ) { #ifdef VALGRIND_FREELIKE_BLOCK VALGRIND_FREELIKE_BLOCK( ptr, 0 ); #endif } -static inline void notify_realloc( void const *ptr, SIZE_T size_old, SIZE_T size_new ) +static inline void valgrind_notify_resize( void const *ptr, SIZE_T size_old, SIZE_T size_new ) { #ifdef VALGRIND_RESIZEINPLACE_BLOCK /* zero is not a valid size */ @@ -400,7 +400,7 @@ static inline void notify_realloc( void const *ptr, SIZE_T size_old, SIZE_T size #endif } -static void notify_free_all( SUBHEAP *subheap ) +static void valgrind_notify_free_all( SUBHEAP *subheap ) { #ifdef VALGRIND_FREELIKE_BLOCK struct block *block; @@ -411,7 +411,7 @@ static void notify_free_all( SUBHEAP *subheap ) for (block = first_block( subheap ); block; block = next_block( subheap, block )) { if (block_get_flags( block ) & BLOCK_FLAG_FREE) continue; - if (block_get_type( block ) == ARENA_INUSE_MAGIC) notify_free( block + 1 ); + if (block_get_type( block ) == ARENA_INUSE_MAGIC) valgrind_notify_free( block + 1 ); } #endif } @@ -801,7 +801,6 @@ static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) arena->magic = ARENA_LARGE_MAGIC; mark_block_tail( (char *)(arena + 1) + size, block_size - sizeof(*arena) - size, flags ); list_add_tail( &heap->large_list, &arena->entry ); - notify_alloc( arena + 1, size, flags & HEAP_ZERO_MEMORY ); return arena + 1; } @@ -833,11 +832,7 @@ static void *realloc_large_block( HEAP *heap, DWORD flags, void *ptr, SIZE_T siz SIZE_T unused = arena->block_size - sizeof(*arena) - size; /* FIXME: we could remap zero-pages instead */ -#ifdef VALGRIND_RESIZEINPLACE_BLOCK - if (RUNNING_ON_VALGRIND) - notify_realloc( arena + 1, arena->data_size, size ); - else -#endif + valgrind_notify_resize( arena + 1, arena->data_size, size ); if (size > arena->data_size) initialize_block( (char *)ptr + arena->data_size, size - arena->data_size, unused, flags ); else @@ -851,9 +846,10 @@ static void *realloc_large_block( HEAP *heap, DWORD flags, void *ptr, SIZE_T siz WARN("Could not allocate block for %08lx bytes\n", size ); return NULL; } + valgrind_notify_alloc( new_ptr, size, 0 ); memcpy( new_ptr, ptr, arena->data_size ); + valgrind_notify_free( ptr ); free_large_block( heap, ptr ); - notify_free( ptr ); return new_ptr; } @@ -1473,13 +1469,13 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) LIST_FOR_EACH_ENTRY_SAFE( subheap, next, &heapPtr->subheap_list, SUBHEAP, entry ) { if (subheap == &heapPtr->subheap) continue; /* do this one last */ - notify_free_all( subheap ); + valgrind_notify_free_all( subheap ); list_remove( &subheap->entry ); size = 0; addr = ROUND_ADDR( subheap, COMMIT_MASK ); NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } - notify_free_all( &heapPtr->subheap ); + valgrind_notify_free_all( &heapPtr->subheap ); size = 0; addr = heap; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); @@ -1510,8 +1506,6 @@ static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret block_set_type( block, ARENA_INUSE_MAGIC ); shrink_used_block( subheap, block, 0, old_block_size, block_size, size ); - - notify_alloc( block + 1, size, flags & HEAP_ZERO_MEMORY ); initialize_block( block + 1, size, block->unused_bytes, flags ); *ret = block + 1; @@ -1536,6 +1530,8 @@ void *WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T heap_unlock( heapPtr, flags ); } + if (!status) valgrind_notify_alloc( ptr, size, flags & HEAP_ZERO_MEMORY ); + TRACE( "heap %p, flags %#x, size %#Ix, return %p, status %#x.\n", heap, flags, size, ptr, status ); heap_set_status( heapPtr, flags, status ); return ptr; @@ -1547,9 +1543,6 @@ static NTSTATUS heap_free( HEAP *heap, void *ptr ) ARENA_INUSE *block; SUBHEAP *subheap; - /* Inform valgrind we are trying to free memory, so it can throw up an error message */ - notify_free( ptr ); - if (!(block = unsafe_block_from_ptr( heap, ptr, &subheap ))) return STATUS_INVALID_PARAMETER; if (!subheap) free_large_block( heap, ptr ); else free_used_block( subheap, block ); @@ -1567,6 +1560,8 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE heap, ULONG flags, void *pt if (!ptr) return TRUE; + valgrind_notify_free( ptr ); + if (!(heapPtr = HEAP_GetPtr( heap ))) status = STATUS_INVALID_PARAMETER; else @@ -1614,23 +1609,24 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size list_remove( &entry->entry ); old_block_size += block_get_size( next ); if (!subheap_commit( subheap, block, block_size )) return STATUS_NO_MEMORY; - notify_realloc( block + 1, old_size, size ); + valgrind_notify_resize( block + 1, old_size, size ); shrink_used_block( subheap, block, block_get_flags( block ), old_block_size, block_size, size ); } else { if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return STATUS_NO_MEMORY; if ((status = heap_allocate( heap, flags & ~HEAP_ZERO_MEMORY, size, ret ))) return status; + valgrind_notify_alloc( *ret, size, 0 ); memcpy( *ret, block + 1, old_size ); if (flags & HEAP_ZERO_MEMORY) memset( (char *)*ret + old_size, 0, size - old_size ); - notify_free( ptr ); + valgrind_notify_free( ptr ); free_used_block( subheap, block ); return STATUS_SUCCESS; } } else { - notify_realloc( block + 1, old_size, size ); + valgrind_notify_resize( block + 1, old_size, size ); shrink_used_block( subheap, block, block_get_flags( block ), old_block_size, block_size, size ); }

1 0

Rémi Bernon : ntdll: Merge common resize case in heap_realloc.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: 75b78517ceebaf33d09b03323bab87c2085ad09a URL: https://source.winehq.org/git/wine.git/?a=commit;h=75b78517ceebaf33d09b0332… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 30 22:26:48 2022 +0200 ntdll: Merge common resize case in heap_realloc. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 4050c00c265..0102ba3ea42 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1609,8 +1609,6 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size list_remove( &entry->entry ); old_block_size += block_get_size( next ); if (!subheap_commit( subheap, block, block_size )) return STATUS_NO_MEMORY; - valgrind_notify_resize( block + 1, old_size, size ); - shrink_used_block( subheap, block, block_get_flags( block ), old_block_size, block_size, size ); } else { @@ -1624,13 +1622,9 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size return STATUS_SUCCESS; } } - else - { - valgrind_notify_resize( block + 1, old_size, size ); - shrink_used_block( subheap, block, block_get_flags( block ), old_block_size, block_size, size ); - } - /* Clear the extra bytes if needed */ + valgrind_notify_resize( block + 1, old_size, size ); + shrink_used_block( subheap, block, block_get_flags( block ), old_block_size, block_size, size ); if (size <= old_size) mark_block_tail( (char *)(block + 1) + size, block->unused_bytes, flags ); else initialize_block( (char *)(block + 1) + old_size, size - old_size, block->unused_bytes, flags );

1 0

Rémi Bernon : ntdll: Remove tail checking on large blocks.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: 526fc34a39ac146d717eaf96ebadcdeaba4e095e URL: https://source.winehq.org/git/wine.git/?a=commit;h=526fc34a39ac146d717eaf96… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 30 22:07:42 2022 +0200 ntdll: Remove tail checking on large blocks. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 27 +++------------------------ dlls/ntdll/heap.c | 30 +++++++++--------------------- 2 files changed, 12 insertions(+), 45 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 8ef0bfc3668..bb5e57fe94e 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -2242,7 +2242,6 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags ok( diff > expect_size, "got diff %#Ix\n", diff ); tail = ptr0[alloc_size] | ptr1[alloc_size] | ptr2[alloc_size]; - todo_wine_if( heap_flags & HEAP_TAIL_CHECKING_ENABLED ) ok( !tail, "got tail\n" ); ret = HeapFree( heap, 0, ptr2 ); @@ -2492,29 +2491,9 @@ static void test_heap_checks( DWORD flags ) if (flags & HEAP_TAIL_CHECKING_ENABLED) { /* Windows doesn't do tail checking on large blocks */ - ok( p[large_size] == 0xab || broken(p[large_size] == 0), "wrong data %x\n", p[large_size] ); - ok( p[large_size+1] == 0xab || broken(p[large_size+1] == 0), "wrong data %x\n", p[large_size+1] ); - ok( p[large_size+2] == 0xab || broken(p[large_size+2] == 0), "wrong data %x\n", p[large_size+2] ); - if (p[large_size] == 0xab) - { - p[large_size] = 0xcc; - ret = HeapValidate( GetProcessHeap(), 0, p ); - ok( !ret, "HeapValidate succeeded\n" ); - - /* other calls only check when HEAP_VALIDATE is set */ - if (flags & HEAP_VALIDATE) - { - size = HeapSize( GetProcessHeap(), 0, p ); - ok( size == ~(SIZE_T)0, "Wrong size %Iu\n", size ); - - p2 = HeapReAlloc( GetProcessHeap(), 0, p, large_size - 3 ); - ok( p2 == NULL, "HeapReAlloc succeeded\n" ); - - ret = HeapFree( GetProcessHeap(), 0, p ); - ok( !ret, "HeapFree succeeded\n" ); - } - p[large_size] = 0xab; - } + ok( p[large_size] == 0, "wrong data %x\n", p[large_size] ); + ok( p[large_size + 1] == 0, "wrong data %x\n", p[large_size + 1] ); + ok( p[large_size + 2] == 0, "wrong data %x\n", p[large_size + 2] ); } ret = HeapFree( GetProcessHeap(), 0, p ); diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 0102ba3ea42..00b4cd7e894 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -783,7 +783,7 @@ static inline void shrink_used_block( SUBHEAP *subheap, struct block *block, UIN static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) { ARENA_LARGE *arena; - SIZE_T block_size = sizeof(*arena) + ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags); + SIZE_T block_size = sizeof(*arena) + ROUND_SIZE( size ); LPVOID address = NULL; if (!(flags & HEAP_GROWABLE)) return NULL; @@ -799,8 +799,9 @@ static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) arena->block_size = block_size; arena->size = ARENA_LARGE_SIZE; arena->magic = ARENA_LARGE_MAGIC; - mark_block_tail( (char *)(arena + 1) + size, block_size - sizeof(*arena) - size, flags ); list_add_tail( &heap->large_list, &arena->entry ); + valgrind_make_noaccess( (char *)arena + sizeof(*arena) + arena->data_size, + arena->block_size - sizeof(*arena) - arena->data_size ); return arena + 1; } @@ -825,19 +826,17 @@ static void free_large_block( HEAP *heap, void *ptr ) static void *realloc_large_block( HEAP *heap, DWORD flags, void *ptr, SIZE_T size ) { ARENA_LARGE *arena = (ARENA_LARGE *)ptr - 1; + SIZE_T old_size = arena->data_size; void *new_ptr; if (arena->block_size - sizeof(*arena) >= size) { - SIZE_T unused = arena->block_size - sizeof(*arena) - size; - /* FIXME: we could remap zero-pages instead */ - valgrind_notify_resize( arena + 1, arena->data_size, size ); - if (size > arena->data_size) - initialize_block( (char *)ptr + arena->data_size, size - arena->data_size, unused, flags ); - else - mark_block_tail( (char *)ptr + size, unused, flags ); + valgrind_notify_resize( arena + 1, old_size, size ); + if (size > old_size) initialize_block( (char *)ptr + old_size, size - old_size, 0, flags ); arena->data_size = size; + valgrind_make_noaccess( (char *)arena + sizeof(*arena) + arena->data_size, + arena->block_size - sizeof(*arena) - arena->data_size ); return ptr; } if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return NULL; @@ -847,7 +846,7 @@ static void *realloc_large_block( HEAP *heap, DWORD flags, void *ptr, SIZE_T siz return NULL; } valgrind_notify_alloc( new_ptr, size, 0 ); - memcpy( new_ptr, ptr, arena->data_size ); + memcpy( new_ptr, ptr, old_size ); valgrind_notify_free( ptr ); free_large_block( heap, ptr ); return new_ptr; @@ -877,12 +876,6 @@ static BOOL validate_large_arena( const HEAP *heap, const ARENA_LARGE *arena ) err = "invalid block header"; else if (!contains( arena, arena->block_size, arena + 1, arena->data_size )) err = "invalid block size"; - else if (heap->flags & HEAP_TAIL_CHECKING_ENABLED) - { - SIZE_T i, unused = arena->block_size - sizeof(*arena) - arena->data_size; - const unsigned char *data = (const unsigned char *)(arena + 1) + arena->data_size; - for (i = 0; i < unused && !err; i++) if (data[i] != ARENA_TAIL_FILLER) err = "invalid block tail"; - } if (err) { @@ -1317,7 +1310,6 @@ static void heap_set_debug_flags( HANDLE handle ) if (flags & (HEAP_FREE_CHECKING_ENABLED | HEAP_TAIL_CHECKING_ENABLED)) /* fix existing blocks */ { struct block *block; - ARENA_LARGE *large; SUBHEAP *subheap; LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry ) @@ -1342,10 +1334,6 @@ static void heap_set_debug_flags( HANDLE handle ) } } } - - LIST_FOR_EACH_ENTRY( large, &heap->large_list, ARENA_LARGE, entry ) - mark_block_tail( (char *)(large + 1) + large->data_size, - large->block_size - sizeof(*large) - large->data_size, flags ); } if ((heap->flags & HEAP_GROWABLE) && !heap->pending_free &&

1 0

Alex Henrie : ntoskrnl: Add KfRaiseIrql stub.
by Alexandre Julliard 31 May '22

31 May '22

Module: wine Branch: master Commit: ddca4eb838f1564734dd9c1d2e42fc67e8e20c90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddca4eb838f1564734dd9c1d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 30 17:13:59 2022 -0600 ntoskrnl: Add KfRaiseIrql stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53076 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0994af447f9..556b683e8f4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4455,6 +4455,15 @@ NTSTATUS WINAPI KdEnableDebugger(void) return STATUS_DEBUGGER_INACTIVE; } +#ifdef __x86_64__ + +void WINAPI KfRaiseIrql(KIRQL new, KIRQL *old) +{ + FIXME("new %u old %p: stub.\n", new, old); +} + +#endif + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4df6b1ae472..84f4a3feec3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -659,6 +659,7 @@ @ stdcall KeWaitForMultipleObjects(long ptr long long long long ptr ptr) @ stdcall KeWaitForMutexObject(ptr long long long ptr) @ stdcall KeWaitForSingleObject(ptr long long long ptr) +@ stdcall -arch=x86_64 KfRaiseIrql(long ptr) @ stub KiBugCheckData @ stub KiCoprocessorError @ stub KiDeliverApc

1 0