Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-06 18:00:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

SEH protect NtReplyWaitReceivePortEx and fix one instance of message type checking to correctly account for kernel LPC messages.

Browse source 
svn path=/trunk/; revision=33428
This commit is contained in:
Filip Navara 2008-05-11 09:39:26 +00:00
parent 973109beb4
commit a907b85b1a
1 changed files with 103 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
reactos/ntoskrnl/lpc/reply.c
View file

@ -160,11 +160,14 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle,
{ {
PLPCP_PORT_OBJECT Port, ReceivePort, ConnectionPort = NULL; PLPCP_PORT_OBJECT Port, ReceivePort, ConnectionPort = NULL;
KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(), WaitMode = PreviousMode; KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(), WaitMode = PreviousMode;
NTSTATUS Status; NTSTATUS Status = STATUS_SUCCESS;
PLPCP_MESSAGE Message; PLPCP_MESSAGE Message;
PETHREAD Thread = PsGetCurrentThread(), WakeupThread; PETHREAD Thread = PsGetCurrentThread(), WakeupThread;
PLPCP_CONNECTION_MESSAGE ConnectMessage; PLPCP_CONNECTION_MESSAGE ConnectMessage;
ULONG ConnectionInfoLength; ULONG ConnectionInfoLength;
PORT_MESSAGE CapturedReplyMessage;
LARGE_INTEGER CapturedTimeout;
PAGED_CODE(); PAGED_CODE();
LPCTRACE(LPC_REPLY_DEBUG, LPCTRACE(LPC_REPLY_DEBUG,
"Handle: %lx. Messages: %p/%p. Context: %p\n", "Handle: %lx. Messages: %p/%p. Context: %p\n",
@ -173,8 +176,42 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle,
ReceiveMessage, ReceiveMessage,
PortContext); PortContext);
if (KeGetPreviousMode() == UserMode)
{
_SEH_TRY
{
if (ReplyMessage != NULL)
{
ProbeForRead(ReplyMessage, sizeof(PORT_MESSAGE), sizeof(ULONG));
RtlCopyMemory(&CapturedReplyMessage, ReplyMessage, sizeof(PORT_MESSAGE));
ReplyMessage = &CapturedReplyMessage;
}
if (Timeout != NULL)
{
ProbeForReadLargeInteger(Timeout);
RtlCopyMemory(&CapturedTimeout, Timeout, sizeof(LARGE_INTEGER));
Timeout = &CapturedTimeout;
}
if (PortContext != NULL)
ProbeForWritePointer(PortContext);
}
_SEH_EXCEPT(_SEH_ExSystemExceptionFilter)
{
Status = _SEH_GetExceptionCode();
}
_SEH_END;
/* Bail out if pointer was invalid */
if (!NT_SUCCESS(Status))
return Status;
}
else
{
/* If this is a system thread, then let it page out its stack */ /* If this is a system thread, then let it page out its stack */
if (Thread->SystemThread) WaitMode = UserMode; if (Thread->SystemThread) WaitMode = UserMode;
}
/* Check if caller has a reply message */ /* Check if caller has a reply message */
if (ReplyMessage) if (ReplyMessage)
@ -388,6 +425,8 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle,
Thread->LpcReceivedMessageId = Message->Request.MessageId; Thread->LpcReceivedMessageId = Message->Request.MessageId;
Thread->LpcReceivedMsgIdValid = TRUE; Thread->LpcReceivedMsgIdValid = TRUE;
_SEH_TRY
{
/* Check if this was a connection request */ /* Check if this was a connection request */
if (LpcpGetMessageType(&Message->Request) == LPC_CONNECTION_REQUEST) if (LpcpGetMessageType(&Message->Request) == LPC_CONNECTION_REQUEST)
{ {
@ -419,7 +458,7 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle,
/* Clear the port context if the caller requested one */ /* Clear the port context if the caller requested one */
if (PortContext) *PortContext = NULL; if (PortContext) *PortContext = NULL;
} }
else if (Message->Request.u2.s2.Type != LPC_REPLY) else if (LpcpGetMessageType(&Message->Request) != LPC_REPLY)
{ {
/* Otherwise, this is a new message or event */ /* Otherwise, this is a new message or event */
LPCTRACE(LPC_REPLY_DEBUG, LPCTRACE(LPC_REPLY_DEBUG,
@ -450,6 +489,12 @@ NtReplyWaitReceivePortEx(IN HANDLE PortHandle,
/* This is a reply message, should never happen! */ /* This is a reply message, should never happen! */
ASSERT(FALSE); ASSERT(FALSE);
} }
}
_SEH_EXCEPT(_SEH_ExSystemExceptionFilter)
{
Status = _SEH_GetExceptionCode();
}
_SEH_END;
/* Check if we have a message pointer here */ /* Check if we have a message pointer here */
if (Message) if (Message)