[ion] 23351: - Add SEH to all iofunc.c functions that required it. (note: Some SEH might seem "useless" to have been added. This is because we don't use Pool Quotas yet, which generate exceptions which will later need to be handled). - Implement IopExceptionCleanup as a generic cleanup handler for SEH exceptions.
29 Jul
2006
29 Jul
'06
4:35 p.m.
Author: ion
Date: Sat Jul 29 20:35:05 2006
New Revision: 23351
URL: http://svn.reactos.org/svn/reactos?rev=23351&view=rev
Log:
- Add SEH to all iofunc.c functions that required it. (note: Some SEH might seem
"useless" to have been added. This is because we don't use Pool Quotas yet,
which generate exceptions which will later need to be handled).
- Implement IopExceptionCleanup as a generic cleanup handler for SEH exceptions.
Modified:
trunk/reactos/ntoskrnl/KrnlFun.c
trunk/reactos/ntoskrnl/io/iomgr/iofunc.c
Modified: trunk/reactos/ntoskrnl/KrnlFun.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=233…
==============================================================================
--- trunk/reactos/ntoskrnl/KrnlFun.c (original)
+++ trunk/reactos/ntoskrnl/KrnlFun.c Sat Jul 29 20:35:05 2006
@@ -10,8 +10,6 @@
//
// Io:
// - See why queueing IRPs and cancelling them causes crashes.
-// - Add SEH to some places where it's missing (MDLs, etc) (iofunc).
-// - Add a generic Cleanup/Exception Routine (iofunc).
// - Add another parameter to IopCleanupFailedIrp.
// - Add Access Checks in IopParseDevice.
// - Add validation checks in IoCreateFile.
Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c…
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Sat Jul 29 20:35:05 2006
@@ -22,6 +22,45 @@
#endif
/* PRIVATE FUNCTIONS *********************************************************/
+
+VOID
+NTAPI
+IopCleanupAfterException(IN PFILE_OBJECT FileObject,
+ IN PIRP Irp,
+ IN PKEVENT Event OPTIONAL,
+ IN PKEVENT LocalEvent OPTIONAL)
+{
+ PAGED_CODE();
+
+ /* Check if we had a buffer */
+ if (Irp->AssociatedIrp.SystemBuffer)
+ {
+ /* Free it */
+ ExFreePool(Irp->AssociatedIrp.SystemBuffer);
+ }
+
+ /* Free the mdl */
+ if (Irp->MdlAddress) IoFreeMdl(Irp->MdlAddress);
+
+ /* Free the IRP */
+ IoFreeIrp(Irp);
+
+ /* Check if we had a file lock */
+ if (FileObject->Flags & FO_SYNCHRONOUS_IO)
+ {
+ /* Release it */
+ IopUnlockFileObject(FileObject);
+ }
+
+ /* Check if we had an event */
+ if (Event) ObDereferenceObject(Event);
+
+ /* Check if we had a local event */
+ if (LocalEvent) ExFreePool(LocalEvent);
+
+ /* Derefenrce the FO */
+ ObDereferenceObject(FileObject);
+}
NTSTATUS
NTAPI
@@ -1027,7 +1066,7 @@
IN BOOLEAN ExclusiveLock)
{
PFILE_OBJECT FileObject;
- PLARGE_INTEGER LocalLength;
+ PLARGE_INTEGER LocalLength = NULL;
PIRP Irp;
PIO_STACK_LOCATION StackPtr;
PDEVICE_OBJECT DeviceObject;
@@ -1143,25 +1182,32 @@
StackPtr->MinorFunction = IRP_MN_LOCK;
StackPtr->FileObject = FileObject;
- /* Allocate local buffer */
- LocalLength = ExAllocatePoolWithTag(NonPagedPool,
- sizeof(LARGE_INTEGER),
- TAG_LOCK);
- if (!LocalLength)
- {
- /* Fail */
- IoFreeIrp(Irp);
- if (Event) ObDereferenceObject(Event);
- ObDereferenceObject(FileObject);
- return STATUS_INSUFFICIENT_RESOURCES;
- }
-
- /* Set the length */
- *LocalLength = CapturedLength;
+ /* Enter SEH */
+ _SEH_TRY
+ {
+ /* Allocate local buffer */
+ LocalLength = ExAllocatePoolWithTag(NonPagedPool,
+ sizeof(LARGE_INTEGER),
+ TAG_LOCK);
+
+ /* Set the length */
+ *LocalLength = CapturedLength;
+ Irp->Tail.Overlay.AuxiliaryBuffer = (PVOID)LocalLength;
+ StackPtr->Parameters.LockControl.Length = LocalLength;
+ }
+ _SEH_HANDLE
+ {
+ /* Allocating failed, clean up */
+ IopCleanupAfterException(FileObject, Irp, Event, NULL);
+ if (LocalLength) ExFreePool(LocalLength);
+
+ /* Get status */
+ Status = _SEH_GetExceptionCode();
+ }
+ _SEH_END;
+ if (!NT_SUCCESS(Status)) return Status;
/* Set Parameters */
- Irp->Tail.Overlay.AuxiliaryBuffer = (PVOID)LocalLength;
- StackPtr->Parameters.LockControl.Length = LocalLength;
StackPtr->Parameters.LockControl.ByteOffset = CapturedByteOffset;
StackPtr->Parameters.LockControl.Key = Key;
@@ -1337,11 +1383,26 @@
/* Check if this is buffered I/O */
if (DeviceObject->Flags & DO_BUFFERED_IO)
{
- /* Allocate a buffer */
- Irp->AssociatedIrp.SystemBuffer =
- ExAllocatePoolWithTag(NonPagedPool,
- Length,
- TAG_SYSB);
+ /* Enter SEH */
+ _SEH_TRY
+ {
+ /* Allocate a buffer */
+ Irp->AssociatedIrp.SystemBuffer =
+ ExAllocatePoolWithTag(NonPagedPool,
+ Length,
+ TAG_SYSB);
+ }
+ _SEH_HANDLE
+ {
+ /* Allocating failed, clean up */
+ IopCleanupAfterException(FileObject, Irp, Event, NULL);
+ if (AuxBuffer) ExFreePool(AuxBuffer);
+
+ /* Get status */
+ Status = _SEH_GetExceptionCode();
+ }
+ _SEH_END;
+ if (!NT_SUCCESS(Status)) return Status;
/* Set the buffer and flags */
Irp->UserBuffer = FileInformation;
@@ -1545,11 +1606,23 @@
StackPtr->MajorFunction = IRP_MJ_QUERY_INFORMATION;
StackPtr->FileObject = FileObject;
- /* Allocate a buffer */
- Irp->AssociatedIrp.SystemBuffer =
- ExAllocatePoolWithTag(NonPagedPool,
- Length,
- TAG_SYSB);
+ /* Enter SEH */
+ _SEH_TRY
+ {
+ /* Allocate a buffer */
+ Irp->AssociatedIrp.SystemBuffer =
+ ExAllocatePoolWithTag(NonPagedPool,
+ Length,
+ TAG_SYSB);
+ }
+ _SEH_HANDLE
+ {
+ /* Allocating failed, clean up */
+ IopCleanupAfterException(FileObject, Irp, NULL, Event);
+ Status = _SEH_GetExceptionCode();
+ }
+ _SEH_END;
+ if (!NT_SUCCESS(Status)) return Status;
/* Set the flags */
Irp->Flags = (IRP_BUFFERED_IO |
@@ -1575,7 +1648,7 @@
if (LocalEvent)
{
/* Then to a non-alertable wait */
- Status = KeWaitForSingleObject(&Event,
+ Status = KeWaitForSingleObject(Event,
Executive,
PreviousMode,
FALSE,
@@ -1839,11 +1912,23 @@
/* Check if we have a buffer length */
if (Length)
{
- /* Allocate a buffer */
- Irp->AssociatedIrp.SystemBuffer =
- ExAllocatePoolWithTag(NonPagedPool,
- Length,
- TAG_SYSB);
+ /* Enter SEH */
+ _SEH_TRY
+ {
+ /* Allocate a buffer */
+ Irp->AssociatedIrp.SystemBuffer =
+ ExAllocatePoolWithTag(NonPagedPool,
+ Length,
+ TAG_SYSB);
+ }
+ _SEH_HANDLE
+ {
+ /* Allocating failed, clean up */
+ IopCleanupAfterException(FileObject, Irp, NULL, Event);
+ Status = _SEH_GetExceptionCode();
+ }
+ _SEH_END;
+ if (!NT_SUCCESS(Status)) return Status;
/* Set the buffer and flags */
Irp->UserBuffer = Buffer;
@@ -2063,14 +2148,28 @@
StackPtr->MajorFunction = IRP_MJ_SET_INFORMATION;
StackPtr->FileObject = FileObject;
- /* Allocate a buffer */
- Irp->AssociatedIrp.SystemBuffer =
- ExAllocatePoolWithTag(NonPagedPool,
- Length,
- TAG_SYSB);
-
- /* Copy the data into it */
- RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, FileInformation, Length);
+ /* Enter SEH */
+ _SEH_TRY
+ {
+ /* Allocate a buffer */
+ Irp->AssociatedIrp.SystemBuffer =
+ ExAllocatePoolWithTag(NonPagedPool,
+ Length,
+ TAG_SYSB);
+
+ /* Copy the data into it */
+ RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer,
+ FileInformation,
+ Length);
+ }
+ _SEH_HANDLE
+ {
+ /* Allocating failed, clean up */
+ IopCleanupAfterException(FileObject, Irp, NULL, Event);
+ Status = _SEH_GetExceptionCode();
+ }
+ _SEH_END;
+ if (!NT_SUCCESS(Status)) return Status;
/* Set the flags */
Irp->Flags = (IRP_BUFFERED_IO |
@@ -2266,7 +2365,7 @@
IN ULONG Key OPTIONAL)
{
PFILE_OBJECT FileObject;
- PLARGE_INTEGER LocalLength;
+ PLARGE_INTEGER LocalLength = NULL;
PIRP Irp;
PIO_STACK_LOCATION StackPtr;
PDEVICE_OBJECT DeviceObject;
@@ -2381,25 +2480,32 @@
StackPtr->MinorFunction = IRP_MN_UNLOCK_SINGLE;
StackPtr->FileObject = FileObject;
- /* Allocate local buffer */
- LocalLength = ExAllocatePoolWithTag(NonPagedPool,
- sizeof(LARGE_INTEGER),
+ /* Enter SEH */
+ _SEH_TRY
+ {
+ /* Allocate a buffer */
+ LocalLength = ExAllocatePoolWithTag(NonPagedPool,
+ sizeof(LARGE_INTEGER),
TAG_LOCK);
- if (!LocalLength)
- {
- /* Fail */
- IoFreeIrp(Irp);
- if (Event) ObDereferenceObject(Event);
- ObDereferenceObject(FileObject);
- return STATUS_INSUFFICIENT_RESOURCES;
- }
-
- /* Set the length */
- *LocalLength = CapturedLength;
+
+ /* Set the length */
+ *LocalLength = CapturedLength;
+ Irp->Tail.Overlay.AuxiliaryBuffer = (PVOID)LocalLength;
+ StackPtr->Parameters.LockControl.Length = LocalLength;
+ }
+ _SEH_HANDLE
+ {
+ /* Allocating failed, clean up */
+ IopCleanupAfterException(FileObject, Irp, NULL, Event);
+ if (LocalLength) ExFreePool(LocalLength);
+
+ /* Get exception status */
+ Status = _SEH_GetExceptionCode();
+ }
+ _SEH_END;
+ if (!NT_SUCCESS(Status)) return Status;
/* Set Parameters */
- Irp->Tail.Overlay.AuxiliaryBuffer = (PVOID)LocalLength;
- StackPtr->Parameters.LockControl.Length = LocalLength;
StackPtr->Parameters.LockControl.ByteOffset = CapturedByteOffset;
StackPtr->Parameters.LockControl.Key = Key;
@@ -2619,14 +2725,27 @@
/* Check if we have a buffer length */
if (Length)
{
- /* Allocate a buffer */
- Irp->AssociatedIrp.SystemBuffer =
- ExAllocatePoolWithTag(NonPagedPool,
- Length,
- TAG_SYSB);
-
- /* Copy the buffer and set flags */
- RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, Buffer, Length);
+ /* Enter SEH */
+ _SEH_TRY
+ {
+ /* Allocate a buffer */
+ Irp->AssociatedIrp.SystemBuffer =
+ ExAllocatePoolWithTag(NonPagedPool,
+ Length,
+ TAG_SYSB);
+
+ /* Copy the data into it */
+ RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, Buffer, Length);
+ }
+ _SEH_HANDLE
+ {
+ /* Allocating failed, clean up */
+ IopCleanupAfterException(FileObject, Irp, Event, NULL);
+ Status = _SEH_GetExceptionCode();
+ }
+ _SEH_END;
+
+ /* Set the flags */
Irp->Flags = (IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER);
}
else
@@ -2785,18 +2904,23 @@
StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION;
StackPtr->FileObject = FileObject;
- /* Allocate system buffer */
- Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool,
- Length,
- TAG_SYSB);
- if (!Irp->AssociatedIrp.SystemBuffer)
- {
- /* Fail */
- IoFreeIrp(Irp);
- if (Event) ObDereferenceObject(Event);
- ObDereferenceObject(FileObject);
- return STATUS_INSUFFICIENT_RESOURCES;
- }
+ /* Enter SEH */
+ _SEH_TRY
+ {
+ /* Allocate a buffer */
+ Irp->AssociatedIrp.SystemBuffer =
+ ExAllocatePoolWithTag(NonPagedPool,
+ Length,
+ TAG_SYSB);
+ }
+ _SEH_HANDLE
+ {
+ /* Allocating failed, clean up */
+ IopCleanupAfterException(FileObject, Irp, NULL, Event);
+ Status = _SEH_GetExceptionCode();
+ }
+ _SEH_END;
+ if (!NT_SUCCESS(Status)) return Status;
/* Set the flags for this buffered + deferred I/O */
Irp->Flags |= (IRP_BUFFERED_IO |
@@ -2930,21 +3054,26 @@
StackPtr->MajorFunction = IRP_MJ_SET_VOLUME_INFORMATION;
StackPtr->FileObject = FileObject;
- /* Allocate system buffer */
- Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool,
- Length,
- TAG_SYSB);
- if (!Irp->AssociatedIrp.SystemBuffer)
- {
- /* Fail */
- IoFreeIrp(Irp);
- if (Event) ObDereferenceObject(Event);
- ObDereferenceObject(FileObject);
- return STATUS_INSUFFICIENT_RESOURCES;
- }
-
- /* Copy the data into the buffer */
- RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, FsInformation, Length);
+ /* Enter SEH */
+ _SEH_TRY
+ {
+ /* Allocate a buffer */
+ Irp->AssociatedIrp.SystemBuffer =
+ ExAllocatePoolWithTag(NonPagedPool,
+ Length,
+ TAG_SYSB);
+
+ /* Copy the data into it */
+ RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, FsInformation, Length);
+ }
+ _SEH_HANDLE
+ {
+ /* Allocating failed, clean up */
+ IopCleanupAfterException(FileObject, Irp, NULL, Event);
+ Status = _SEH_GetExceptionCode();
+ }
+ _SEH_END;
+ if (!NT_SUCCESS(Status)) return Status;
/* Set the flags for this buffered + deferred I/O */
Irp->Flags |= (IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER);
6678
days inactive
6678
days old
0 comments
1 participants
participants (1)
-
ion＠svn.reactos.org