Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix IopDeleteFile: Use IRP_SYNC_API flag, use local stack event, fix memory leak (Free completion context), dereference completion port, get the right deviceobject if FO_DIRECT_DEVICE_OPEN is set

Browse source 
svn path=/trunk/; revision=14920
This commit is contained in:
Alex Ionescu 2005-05-01 19:36:00 +00:00
parent 722d9a84e4
commit f7695b0f53
1 changed files with 62 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
reactos/ntoskrnl/io/file.c
View file

@ -181,51 +181,66 @@ IopDeleteFile(PVOID ObjectBody)
PIRP Irp; PIRP Irp;
PIO_STACK_LOCATION StackPtr; PIO_STACK_LOCATION StackPtr;
NTSTATUS Status; NTSTATUS Status;
KEVENT Event;
PDEVICE_OBJECT DeviceObject;
IO_STATUS_BLOCK IoStatusBlock;
DPRINT("IopDeleteFile()\n"); DPRINT("IopDeleteFile()\n");
if (FileObject->DeviceObject) if (FileObject->DeviceObject)
{ {
#if 0 /* Check if this is a direct open or not */
//NOTE: Allmost certain that the latest changes to I/O Mgr makes this redundant (OriginalFileObject case) if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN)
ObReferenceObjectByPointer(ObjectBody,
STANDARD_RIGHTS_REQUIRED,
IoFileObjectType,
UserMode);
#endif
KeResetEvent( &FileObject->Event );
Irp = IoAllocateIrp(FileObject->DeviceObject->StackSize, TRUE);
if (Irp == NULL)
{ {
/* DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject);
* FIXME: This case should eventually be handled. We should wait }
* until enough memory is available to allocate the IRP. else
*/ {
ASSERT(FALSE); DeviceObject = IoGetRelatedDeviceObject(FileObject);
} }
Irp->UserEvent = &FileObject->Event; /* Clear and set up Events */
Irp->Tail.Overlay.Thread = PsGetCurrentThread(); KeClearEvent(&FileObject->Event);
Irp->Flags |= IRP_CLOSE_OPERATION; KeInitializeEvent(&Event, SynchronizationEvent, FALSE);
/* Allocate an IRP */
Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE);
/* Set it up */
Irp->UserEvent = &Event;
Irp->UserIosb = &IoStatusBlock;
Irp->Tail.Overlay.Thread = PsGetCurrentThread();
Irp->Tail.Overlay.OriginalFileObject= FileObject;
Irp->Flags = IRP_CLOSE_OPERATION | IRP_SYNCHRONOUS_API;
/* Set up Stack Pointer Data */
StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr = IoGetNextIrpStackLocation(Irp);
StackPtr->MajorFunction = IRP_MJ_CLOSE; StackPtr->MajorFunction = IRP_MJ_CLOSE;
StackPtr->DeviceObject = FileObject->DeviceObject; StackPtr->DeviceObject = DeviceObject;
StackPtr->FileObject = FileObject; StackPtr->FileObject = FileObject;
Status = IoCallDriver(FileObject->DeviceObject, Irp); /* Call the FS Driver */
Status = IoCallDriver(DeviceObject, Irp);
/* Wait for completion */
if (Status == STATUS_PENDING) if (Status == STATUS_PENDING)
{ {
KeWaitForSingleObject(&FileObject->Event, Executive, KernelMode, FALSE, NULL); KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL);
}
} }
if (FileObject->FileName.Buffer != NULL) /* Clear the file name */
if (FileObject->FileName.Buffer)
{ {
ExFreePool(FileObject->FileName.Buffer); ExFreePool(FileObject->FileName.Buffer);
FileObject->FileName.Buffer = 0; FileObject->FileName.Buffer = NULL;
}
/* Free the completion context */
if (FileObject->CompletionContext)
{
ObDereferenceObject(FileObject->CompletionContext->Port);
ExFreePool(FileObject->CompletionContext);
}
} }
} }