Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:33:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:PS]

Browse source 
- In PspExitThread, correctly set the ZeroInit field of the message before calling LpcRequestPort (which would otherwise complain with STATUS_INVALID_PARAMETER and fail to send the message)
- In NtRegisterThreadTerminatePort, dereference the port object in case of failure, not a null pointer
CORE-9234 #resolve

svn path=/trunk/; revision=66369
This commit is contained in:
Thomas Faber 2015-02-20 12:04:57 +00:00
parent bd97b31dbc
commit 61021517a7
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/ntoskrnl/ps/kill.c
View file

@ -696,11 +696,11 @@ PspExitThread(IN NTSTATUS ExitStatus)
* port, which means that it died before being fully created. Since we * port, which means that it died before being fully created. Since we
* still have to notify an LPC Server, we'll use the exception port, * still have to notify an LPC Server, we'll use the exception port,
* which we know exists. However, we need to know how far the thread * which we know exists. However, we need to know how far the thread
* actually got created. We have three possibilites: * actually got created. We have three possibilities:
* *
* - NtCreateThread returned an error really early: DeadThread is set. * - NtCreateThread returned an error really early: DeadThread is set.
* - NtCreateThread managed to create the thread: DeadThread is off. * - NtCreateThread managed to create the thread: DeadThread is off.
* - NtCreateThread was creating the thread (with Deadthread set, * - NtCreateThread was creating the thread (with DeadThread set,
* but the thread got killed prematurely: STATUS_THREAD_IS_TERMINATING * but the thread got killed prematurely: STATUS_THREAD_IS_TERMINATING
* is our exit code.) * is our exit code.)
* *
@ -709,6 +709,7 @@ PspExitThread(IN NTSTATUS ExitStatus)
*/ */
/* Setup the message header */ /* Setup the message header */
TerminationMsg.h.u2.ZeroInit = 0;
TerminationMsg.h.u2.s2.Type = LPC_CLIENT_DIED; TerminationMsg.h.u2.s2.Type = LPC_CLIENT_DIED;
TerminationMsg.h.u1.s1.TotalLength = sizeof(TerminationMsg); TerminationMsg.h.u1.s1.TotalLength = sizeof(TerminationMsg);
TerminationMsg.h.u1.s1.DataLength = sizeof(TerminationMsg) - TerminationMsg.h.u1.s1.DataLength = sizeof(TerminationMsg) -
@ -1202,7 +1203,7 @@ NtTerminateProcess(IN HANDLE ProcessHandle OPTIONAL,
if (!ExAcquireRundownProtection(&Process->RundownProtect)) if (!ExAcquireRundownProtection(&Process->RundownProtect))
{ {
/* Failed to lock, fail */ /* Failed to lock, fail */
ObDereferenceObject (Process); ObDereferenceObject(Process);
return STATUS_PROCESS_IS_TERMINATING; return STATUS_PROCESS_IS_TERMINATING;
} }
@ -1372,6 +1373,6 @@ NtRegisterThreadTerminatePort(IN HANDLE PortHandle)
} }
/* Dereference and Fail */ /* Dereference and Fail */
ObDereferenceObject(TerminationPort); ObDereferenceObject(TerminationLpcPort);
return STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES;
} }