Martin Storsjö : ntdll: Error out if unwinding isn't progressing on arm.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d00c897749a06a5fe24e8e6d09acb5dc735469bf
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=d00c897749a06a5fe24e8e6d09acb5dc735469bf

Author: Martin Storsjö <martin at martin.st>
Date:   Mon Nov 15 16:02:08 2021 +0200

ntdll: Error out if unwinding isn't progressing on arm.

In PE builds of wine, there's no unwind info (as LLVM hasn't
implemented generating SEH unwind info for ARM yet).

On startup of wine, an exception of the type RPC_S_SERVER_UNAVAILABLE
is raised. In a PE build of Wine, the unwind would get stuck in
an infinite loop.

This still loops for a short while; after returning the error
STATUS_INVALID_DISPOSITION, KiUserExceptionDispatcher ends up
calling RtlRaiseStatus with this status, which then tries to
unwind again, getting stuck similarly. However by recursively
trying to unwind multiple times, the process crashes fairly soon
after running out of stack.

Signed-off-by: Martin Storsjö <martin at martin.st>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/unix/signal_arm.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c
index fc37f917219..2017cf150db 100644
--- a/dlls/ntdll/unix/signal_arm.c
+++ b/dlls/ntdll/unix/signal_arm.c
@@ -255,13 +255,16 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispa
     }
     if (rc == -UNW_ENOINFO || ip < info.start_ip || ip > info.end_ip)
     {
-        TRACE( "no info found for %x ip %x-%x, assuming leaf function\n",
-               ip, info.start_ip, info.end_ip );
+        NTSTATUS status = context->Pc != context->Lr ?
+                          STATUS_SUCCESS : STATUS_INVALID_DISPOSITION;
+        TRACE( "no info found for %x ip %x-%x, %s\n",
+               ip, info.start_ip, info.end_ip, status == STATUS_SUCCESS ?
+               "assuming leaf function" : "error, stuck" );
         dispatch->LanguageHandler = NULL;
         dispatch->EstablisherFrame = context->Sp;
         context->Pc = context->Lr;
         context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL;
-        return STATUS_SUCCESS;
+        return status;
     }
 
     TRACE( "ip %#x function %#lx-%#lx personality %#lx lsda %#lx fde %#lx\n",