Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix kernel-crash when handling user-mode exception with trashed stack pointer. Patch by Mike Nordell.

Browse source 
svn path=/trunk/; revision=6971
This commit is contained in:
Thomas Bluemel 2003-12-12 17:09:27 +00:00
parent 3deb3adee6
commit 08984a5120
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reactos/ntoskrnl/ke/catch.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: catch.c,v 1.36 2003/12/12 16:42:16 weiden Exp $ /* $Id: catch.c,v 1.37 2003/12/12 17:09:27 weiden Exp $
* *
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
* FILE: ntoskrnl/ke/catch.c * FILE: ntoskrnl/ke/catch.c
@ -98,11 +98,8 @@ KiDispatchException(PEXCEPTION_RECORD ExceptionRecord,
{ {
PULONG Stack; PULONG Stack;
ULONG CDest; ULONG CDest;
#define CATCH_CHECKING_DEST_ADDR
#if defined(CATCH_CHECKING_DEST_ADDR)
char temp_space[12 + sizeof(EXCEPTION_RECORD) + sizeof(CONTEXT)]; // FIXME: HACKHACK char temp_space[12 + sizeof(EXCEPTION_RECORD) + sizeof(CONTEXT)]; // FIXME: HACKHACK
NTSTATUS StatusOfCopy; NTSTATUS StatusOfCopy;
#endif
/* FIXME: Forward exception to user mode debugger */ /* FIXME: Forward exception to user mode debugger */
@ -111,13 +108,7 @@ KiDispatchException(PEXCEPTION_RECORD ExceptionRecord,
/* /*
* Let usermode try and handle the exception * Let usermode try and handle the exception
*/ */
#if !defined(CATCH_CHECKING_DEST_ADDR)
Tf->Esp = Tf->Esp -
(12 + sizeof(EXCEPTION_RECORD) + sizeof(CONTEXT));
Stack = (PULONG)Tf->Esp;
#else
Stack = (PULONG)temp_space; Stack = (PULONG)temp_space;
#endif
CDest = 3 + (ROUND_UP(sizeof(EXCEPTION_RECORD), 4) / 4); CDest = 3 + (ROUND_UP(sizeof(EXCEPTION_RECORD), 4) / 4);
/* Return address */ /* Return address */
Stack[0] = 0; Stack[0] = 0;
@ -128,7 +119,6 @@ KiDispatchException(PEXCEPTION_RECORD ExceptionRecord,
memcpy(&Stack[3], ExceptionRecord, sizeof(EXCEPTION_RECORD)); memcpy(&Stack[3], ExceptionRecord, sizeof(EXCEPTION_RECORD));
memcpy(&Stack[CDest], Context, sizeof(CONTEXT)); memcpy(&Stack[CDest], Context, sizeof(CONTEXT));
#if defined(CATCH_CHECKING_DEST_ADDR)
StatusOfCopy = MmCopyToCaller((PVOID)(Tf->Esp - (12 + sizeof(EXCEPTION_RECORD) + sizeof(CONTEXT))), StatusOfCopy = MmCopyToCaller((PVOID)(Tf->Esp - (12 + sizeof(EXCEPTION_RECORD) + sizeof(CONTEXT))),
temp_space, temp_space,
(12 + sizeof(EXCEPTION_RECORD) + sizeof(CONTEXT))); (12 + sizeof(EXCEPTION_RECORD) + sizeof(CONTEXT)));
@ -144,7 +134,6 @@ KiDispatchException(PEXCEPTION_RECORD ExceptionRecord,
ZwTerminateThread(NtCurrentThread(), ExceptionRecord->ExceptionCode); ZwTerminateThread(NtCurrentThread(), ExceptionRecord->ExceptionCode);
DPRINT1("User-mode stack was invalid. Terminating target thread\nn"); DPRINT1("User-mode stack was invalid. Terminating target thread\nn");
} }
#endif
Tf->Eip = (ULONG)LdrpGetSystemDllExceptionDispatcher(); Tf->Eip = (ULONG)LdrpGetSystemDllExceptionDispatcher();
return; return;
} }