Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

NtRemoveIoCompletion: didn't check for possible NTSTATUS codes returned from KeRemoveQueue

Browse source 
Spotted by GvG

svn path=/trunk/; revision=12268
This commit is contained in:
Gunnar Dalsnes 2004-12-21 02:34:32 +00:00
parent ff32df1937
commit 93af2278c0
1 changed files with 38 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
reactos/ntoskrnl/io/iocomp.c
View file

@ -279,6 +279,8 @@ NtRemoveIoCompletion(
{ {
PKQUEUE Queue; PKQUEUE Queue;
NTSTATUS Status; NTSTATUS Status;
PIO_COMPLETION_PACKET Packet;
PLIST_ENTRY ListEntry;
Status = ObReferenceObjectByHandle( IoCompletionHandle, Status = ObReferenceObjectByHandle( IoCompletionHandle,
IO_COMPLETION_MODIFY_STATE, IO_COMPLETION_MODIFY_STATE,
@ -286,29 +288,45 @@ NtRemoveIoCompletion(
UserMode, UserMode,
(PVOID*)&Queue, (PVOID*)&Queue,
NULL); NULL);
if (NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
PIO_COMPLETION_PACKET Packet; return Status;
PLIST_ENTRY ListEntry;
/*
Try 2 remove packet from queue. Wait (optionaly) if
no packet in queue or max num of threads allready running.
*/
ListEntry = KeRemoveQueue(Queue, UserMode, Timeout );
ObDereferenceObject(Queue);
Packet = CONTAINING_RECORD(ListEntry, IO_COMPLETION_PACKET, ListEntry);
if (CompletionKey) *CompletionKey = Packet->Key;
if (CompletionContext) *CompletionContext = Packet->Context;
if (IoStatusBlock) *IoStatusBlock = Packet->IoStatus;
ExFreeToNPagedLookasideList(&IoCompletionPacketLookaside, Packet);
} }
return Status; /*
Try 2 remove packet from queue. Wait (optionaly) if
no packet in queue or max num of threads allready running.
*/
do {
ListEntry = KeRemoveQueue(Queue, UserMode, Timeout );
/* Nebbets book says nothing about NtRemoveIoCompletion returning STATUS_USER_APC,
and the umode equivalent GetQueuedCompletionStatus says nothing about this either,
so my guess it we should restart the operation. Need further investigation. -Gunnar
*/
} while((NTSTATUS)ListEntry == STATUS_USER_APC);
ObDereferenceObject(Queue);
if ((NTSTATUS)ListEntry == STATUS_TIMEOUT)
{
return STATUS_TIMEOUT;
}
ASSERT(ListEntry);
Packet = CONTAINING_RECORD(ListEntry, IO_COMPLETION_PACKET, ListEntry);
if (CompletionKey) *CompletionKey = Packet->Key;
if (CompletionContext) *CompletionContext = Packet->Context;
if (IoStatusBlock) *IoStatusBlock = Packet->IoStatus;
ExFreeToNPagedLookasideList(&IoCompletionPacketLookaside, Packet);
return STATUS_SUCCESS;
} }