[PATCH v3 0/1] MR11071: ntdll: Ignore hardware breakpoint traps inside the signal stack.

[Soham Nandy (＠natimerry)]

Ignore hardware-breakpoint traps raised to avoid recursively dispatching a trap through the Unix signal handler when user code installs a hardware breakpoint that is also reached from Wine's signal-handling path.

This is split up from https://gitlab.winehq.org/wine/wine/-/merge_requests/11069 as asked.

--
  v3: ntdll: Ignore hardware breakpoint traps inside the signal stack.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11071

[PATCH v3 1/1] ntdll: Ignore hardware breakpoint traps inside the signal stack.

[Soham Nandy]

From: Soham Nandy <[e-mail]>

Ignore hardware-breakpoint traps raised to avoid recursively
dispatching a trap through the Unix signal handler when user code
installs a hardware breakpoint that is also reached from Wine's
signal-handling path
---
 dlls/ntdll/unix/signal_i386.c   | 5 +++--
 dlls/ntdll/unix/signal_x86_64.c | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index ea535bd4d27..007656d9239 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -1922,9 +1922,10 @@ static BOOL handle_syscall_trap( struct thread_data *data, ucontext_t *sigcontex
         EIP_sig( sigcontext ) = (ULONG)__wine_unix_call_dispatcher_prolog_end;
         fixup_frame_fpu_state( frame, sigcontext );
     }
-    else if (siginfo->si_code == 4 /* TRAP_HWBKPT */ && is_inside_syscall( data, ESP_sig(sigcontext) ))
+    else if (siginfo->si_code == 4 /* TRAP_HWBKPT */ && (is_inside_syscall( data, ESP_sig(sigcontext) )
+             || is_inside_signal_stack( data, (void *)ESP_sig(sigcontext) )))
     {
-        TRACE_(seh)( "ignoring HWBKPT in syscall eip=%p\n", (void *)EIP_sig(sigcontext) );
+        TRACE_(seh)( "ignoring HWBKPT eip=%p\n", (void *)EIP_sig(sigcontext) );
         return TRUE;
     }
     else return FALSE;
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 41293fe5607..5ba2be32ce1 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -2149,9 +2149,10 @@ static BOOL handle_syscall_trap( struct thread_data *data, ucontext_t *sigcontex
         R10_sig( sigcontext ) = RCX_sig( sigcontext );
         fixup_frame_fpu_state( frame, sigcontext );
     }
-    else if (siginfo->si_code == 4 /* TRAP_HWBKPT */ && is_inside_syscall( data, RSP_sig(sigcontext) ))
+    else if (siginfo->si_code == 4 /* TRAP_HWBKPT */ && (is_inside_syscall( data, RSP_sig(sigcontext) )
+             || is_inside_signal_stack( data, (void *)RSP_sig(sigcontext) )))
     {
-        TRACE_(seh)( "ignoring HWBKPT in syscall rip=%p\n", (void *)RIP_sig(sigcontext) );
+        TRACE_(seh)( "ignoring HWBKPT rip=%p\n", (void *)RIP_sig(sigcontext) );
         return TRUE;
     }
     else return FALSE;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/11071

[Soham Nandy (＠natimerry)]

Rebased and pushed with formatting suggested by paul and mirrored changes for i386

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11071#note_142250

[PATCH v3 0/1] MR11071: ntdll: Ignore hardware breakpoint traps inside the signal stack. - approved

[Paul Gofman (＠gofman)]

This merge request was approved by Paul Gofman.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11071