Add SEH...thanks to Hardon for noticing the bugs
Modified: trunk/reactos/ntoskrnl/ps/suspend.c
_____
Modified: trunk/reactos/ntoskrnl/ps/suspend.c
--- trunk/reactos/ntoskrnl/ps/suspend.c 2005-03-29 17:29:02 UTC (rev
14381)
+++ trunk/reactos/ntoskrnl/ps/suspend.c 2005-03-30 00:32:38 UTC (rev
14382)
@@ -37,17 +37,36 @@
{
PETHREAD Thread;
NTSTATUS Status;
+ ULONG Prev;
+ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
PAGED_CODE();
DPRINT("NtResumeThead(ThreadHandle %lx SuspendCount %p)\n",
ThreadHandle, SuspendCount);
+
+ /* Check buffer validity */
+ if(SuspendCount && PreviousMode == UserMode) {
+
+ _SEH_TRY {
+
+ ProbeForWrite(SuspendCount,
+ sizeof(ULONG),
+ sizeof(ULONG));
+ } _SEH_HANDLE {
+
+ Status = _SEH_GetExceptionCode();
+
+ } _SEH_END;
+ if(!NT_SUCCESS(Status)) return Status;
+ }
+
/* Get the Thread Object */
Status = ObReferenceObjectByHandle(ThreadHandle,
THREAD_SUSPEND_RESUME,
PsThreadType,
- KeGetPreviousMode(),
+ PreviousMode,
(PVOID*)&Thread,
NULL);
if (!NT_SUCCESS(Status)) {
@@ -56,7 +75,21 @@
}
/* Call the Kernel Function */
- *SuspendCount = KeResumeThread(&Thread->Tcb);
+ Prev = KeResumeThread(&Thread->Tcb);
+
+ /* Return it */
+ if(SuspendCount) {
+
+ _SEH_TRY {
+
+ *SuspendCount = Prev;
+
+ } _SEH_HANDLE {
+
+ Status = _SEH_GetExceptionCode();
+
+ } _SEH_END;
+ }
/* Dereference and Return */
ObDereferenceObject ((PVOID)Thread);
@@ -83,14 +116,33 @@
{
PETHREAD Thread;
NTSTATUS Status;
+ ULONG Prev;
+ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
PAGED_CODE();
+
+ /* Check buffer validity */
+ if(PreviousSuspendCount && PreviousMode == UserMode) {
+
+ _SEH_TRY {
+
+ ProbeForWrite(PreviousSuspendCount,
+ sizeof(ULONG),
+ sizeof(ULONG));
+ } _SEH_HANDLE {
+
+ Status = _SEH_GetExceptionCode();
+
+ } _SEH_END;
+ if(!NT_SUCCESS(Status)) return Status;
+ }
+
/* Get the Thread Object */
Status = ObReferenceObjectByHandle(ThreadHandle,
THREAD_SUSPEND_RESUME,
PsThreadType,
- KeGetPreviousMode(),
+ PreviousMode,
(PVOID*)&Thread,
NULL);
if (!NT_SUCCESS(Status)) {
@@ -99,7 +151,21 @@
}
/* Call the Kernel Function */
- *PreviousSuspendCount = KeSuspendThread(&Thread->Tcb);
+ Prev = KeSuspendThread(&Thread->Tcb);
+
+ /* Return it */
+ if(PreviousSuspendCount) {
+
+ _SEH_TRY {
+
+ *PreviousSuspendCount = Prev;
+
+ } _SEH_HANDLE {
+
+ Status = _SEH_GetExceptionCode();
+
+ } _SEH_END;
+ }
/* Dereference and Return */
ObDereferenceObject((PVOID)Thread);
Show replies by date