Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Make an I/O Tagged copy of the file name and properly handle failure.

Browse source 
svn path=/trunk/; revision=22904
This commit is contained in:
Alex Ionescu 2006-07-07 17:29:12 +00:00
parent d6e384ce39
commit aa2513791b
3 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/ntoskrnl/include/internal/io.h
View file

@ -610,6 +610,12 @@ IopCreateVpb(
IN PDEVICE_OBJECT DeviceObject IN PDEVICE_OBJECT DeviceObject
); );
VOID
NTAPI
IopDereferenceVpb(
IN PVPB Vpb
);
VOID VOID
NTAPI NTAPI
IoInitFileSystemImplementation( IoInitFileSystemImplementation(

1
reactos/ntoskrnl/include/internal/tag.h
View file

@ -53,6 +53,7 @@
#define TAG_IO TAG('I', 'o', ' ', ' ') #define TAG_IO TAG('I', 'o', ' ', ' ')
#define TAG_ERROR_LOG TAG('I', 'o', 'E', 'r') #define TAG_ERROR_LOG TAG('I', 'o', 'E', 'r')
#define TAG_EA TAG('I', 'o', 'E', 'a') #define TAG_EA TAG('I', 'o', 'E', 'a')
#define TAG_IO_NAME TAG('I', 'o', 'N', 'm')
/* formerly located in io/work.c */ /* formerly located in io/work.c */
#define TAG_IOWI TAG('I', 'O', 'W', 'I') #define TAG_IOWI TAG('I', 'O', 'W', 'I')

32
reactos/ntoskrnl/io/iomgr/file.c
View file

@ -33,7 +33,7 @@ IopParseDevice(IN PVOID ParseObject,
PDEVICE_OBJECT OriginalDeviceObject = (PDEVICE_OBJECT)ParseObject, DeviceObject; PDEVICE_OBJECT OriginalDeviceObject = (PDEVICE_OBJECT)ParseObject, DeviceObject;
NTSTATUS Status; NTSTATUS Status;
PFILE_OBJECT FileObject; PFILE_OBJECT FileObject;
PVPB Vpb; PVPB Vpb = NULL;
PIRP Irp; PIRP Irp;
PEXTENDED_IO_STACK_LOCATION StackLoc; PEXTENDED_IO_STACK_LOCATION StackLoc;
IO_SECURITY_CONTEXT SecurityContext; IO_SECURITY_CONTEXT SecurityContext;
@ -141,9 +141,6 @@ IopParseDevice(IN PVOID ParseObject,
(PVOID*)&FileObject); (PVOID*)&FileObject);
RtlZeroMemory(FileObject, sizeof(FILE_OBJECT)); RtlZeroMemory(FileObject, sizeof(FILE_OBJECT));
/* Create the name for the file object */
RtlCreateUnicodeString(&FileObject->FileName, RemainingName->Buffer);
/* Set the device object and reference it */ /* Set the device object and reference it */
Status = IopReferenceDeviceObject(DeviceObject); Status = IopReferenceDeviceObject(DeviceObject);
FileObject->DeviceObject = DeviceObject; FileObject->DeviceObject = DeviceObject;
@ -249,6 +246,33 @@ IopParseDevice(IN PVOID ParseObject,
StackLoc->Parameters.Create.ShareAccess = OpenPacket->ShareAccess; StackLoc->Parameters.Create.ShareAccess = OpenPacket->ShareAccess;
StackLoc->Parameters.Create.SecurityContext = &SecurityContext; StackLoc->Parameters.Create.SecurityContext = &SecurityContext;
/* Check if the file object has a name */
if (RemainingName->Length)
{
/* Setup the unicode string */
FileObject->FileName.MaximumLength = RemainingName->Length;
FileObject->FileName.Buffer = ExAllocatePoolWithTag(PagedPool,
RemainingName->
Length,
TAG_IO_NAME);
if (!FileObject->FileName.Buffer)
{
/* Failed to allocate the name, free the IRP */
IoFreeIrp(Irp);
/* Dereference the device object and VPB */
IopDereferenceDeviceObject(DeviceObject, FALSE);
if (Vpb) IopDereferenceVpb(Vpb);
/* Clear the FO */
FileObject->DeviceObject = NULL;
return STATUS_INSUFFICIENT_RESOURCES;
}
}
/* Copy the name */
RtlCopyUnicodeString(&FileObject->FileName, RemainingName);
/* Reference the file object and call the driver */ /* Reference the file object and call the driver */
ObReferenceObject(FileObject); ObReferenceObject(FileObject);
OpenPacket->FileObject = FileObject; OpenPacket->FileObject = FileObject;