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

[NTOS:IO] Some fixes for IoRaiseHardError(). (#3302)

Browse source 
CORE-14037

- Fix buggy retrieval of the current calling Irp->Tail.Overlay.Thread.

- The 4th argument (KernelRoutine) to the KeInitializeApc() is **NOT**
  optional; however its 5th argument (RundownRoutine) is.
  So use the mandatory routine for freeing the allocated APC instead.
  We don't use the rundown routine yet.

- Check whether the ExAllocatePoolWithTag() call failed or not before
  queueing the allocated APC.
This commit is contained in:
Hermès Bélusca-Maïto 2020-10-10 17:41:44 +02:00
parent 7790670dd8
commit bd2a40d57b
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ntoskrnl/io/iomgr/error.c
View file

@ -484,14 +484,22 @@ IopLogWorker(IN PVOID Parameter)
ExFreePoolWithTag(Message, TAG_IO);
}
static
VOID
NTAPI
IopFreeApc(IN PKAPC Apc)
IopFreeApc(IN PKAPC Apc,
IN OUT PKNORMAL_ROUTINE* NormalRoutine,
IN OUT PVOID* NormalContext,
IN OUT PVOID* SystemArgument1,
IN OUT PVOID* SystemArgument2)
{
PAGED_CODE();
/* Free the APC */
ExFreePool(Apc);
ExFreePoolWithTag(Apc, TAG_APC);
}
static
VOID
NTAPI
IopRaiseHardError(IN PVOID NormalContext,
@ -657,7 +665,7 @@ IoRaiseHardError(IN PIRP Irp,
IN PVPB Vpb,
IN PDEVICE_OBJECT RealDeviceObject)
{
PETHREAD Thread = (PETHREAD)&Irp->Tail.Overlay.Thread;
PETHREAD Thread = Irp->Tail.Overlay.Thread;
PKAPC ErrorApc;
/* Don't do anything if hard errors are disabled on the thread */
@ -669,21 +677,29 @@ IoRaiseHardError(IN PIRP Irp,
return;
}
/* Setup an APC */
ErrorApc = ExAllocatePoolWithTag(NonPagedPool,
sizeof(KAPC),
TAG_APC);
// TODO: In case we were called in the context of a paging I/O or for
// a synchronous operation, that happens with APCs disabled, queue the
// hard-error call for later processing (see also IofCompleteRequest).
/* Setup an APC and queue it to deal with the error (see OSR documentation) */
ErrorApc = ExAllocatePoolWithTag(NonPagedPool, sizeof(*ErrorApc), TAG_APC);
if (!ErrorApc)
{
/* Fail */
IoCompleteRequest(Irp, IO_DISK_INCREMENT);
return;
}
KeInitializeApc(ErrorApc,
&Thread->Tcb,
Irp->ApcEnvironment,
NULL,
IopFreeApc,
NULL,
IopRaiseHardError,
KernelMode,
Irp);
/* Queue an APC to deal with the error (see osr documentation) */
KeInsertQueueApc(ErrorApc, Vpb, RealDeviceObject, 0);
KeInsertQueueApc(ErrorApc, Vpb, RealDeviceObject, IO_NO_INCREMENT);
}
/*