Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 00:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Verify storage device upon file open request.

Browse source 
svn path=/trunk/; revision=4963
This commit is contained in:
Eric Kohl 2003-06-24 21:34:41 +00:00
parent db571ee907
commit 676160308e
2 changed files with 44 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reactos/drivers/fs/vfat/create.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: create.c,v 1.58 2003/06/16 19:15:57 hbirr Exp $
/* $Id: create.c,v 1.59 2003/06/24 21:34:41 ekohl Exp $
*
* PROJECT: ReactOS kernel
* FILE: services/fs/vfat/create.c
@ -525,7 +525,7 @@ VfatCreateFile (PDEVICE_OBJECT DeviceObject, PIRP Irp)
RequestedDisposition = ((Stack->Parameters.Create.Options >> 24) & 0xff);
RequestedOptions =
Stack->Parameters.Create.Options & FILE_VALID_OPTION_FLAGS;
PagingFileCreate = (Stack->Flags & SL_OPEN_PAGING_FILE) ? TRUE : FALSE;
PagingFileCreate = (Stack->Flags & SL_OPEN_PAGING_FILE) ? TRUE : FALSE;
FileObject = Stack->FileObject;
DeviceExt = DeviceObject->DeviceExtension;
@ -536,6 +536,15 @@ VfatCreateFile (PDEVICE_OBJECT DeviceObject, PIRP Irp)
return(STATUS_INVALID_PARAMETER);
}
/* Verify volume */
Status = IoVerifyVolume (DeviceExt->StorageDevice,
FALSE);
if (!NT_SUCCESS (Status))
{
DPRINT("IoVerifyVolume() failed (Status %lx)\n", Status);
return Status;
}
/* This a open operation for the volume itself */
if (FileObject->FileName.Length == 0 &&
FileObject->RelatedFileObject == NULL)
@ -598,7 +607,7 @@ VfatCreateFile (PDEVICE_OBJECT DeviceObject, PIRP Irp)
* If the file open failed then create the required file
*/
if (!NT_SUCCESS (Status))
{
{
if (RequestedDisposition == FILE_CREATE ||
RequestedDisposition == FILE_OPEN_IF ||
RequestedDisposition == FILE_OVERWRITE_IF ||

40
reactos/drivers/fs/vfat/fsctl.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: fsctl.c,v 1.16 2003/06/07 11:34:36 chorns Exp $
/* $Id: fsctl.c,v 1.17 2003/06/24 21:34:41 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -212,6 +212,7 @@ VfatMount (PVFAT_IRP_CONTEXT IrpContext)
PVFATFCB VolumeFcb = NULL;
PVFATCCB Ccb = NULL;
LARGE_INTEGER timeout;
PDEVICE_OBJECT DeviceToMount;
DPRINT("VfatMount(IrpContext %x)\n", IrpContext);
@ -223,7 +224,9 @@ VfatMount (PVFAT_IRP_CONTEXT IrpContext)
goto ByeBye;
}
Status = VfatHasFileSystem (IrpContext->Stack->Parameters.MountVolume.DeviceObject, &RecognizedFS, NULL);
DeviceToMount = IrpContext->Stack->Parameters.MountVolume.DeviceObject;
Status = VfatHasFileSystem (DeviceToMount, &RecognizedFS, NULL);
if (!NT_SUCCESS(Status))
{
goto ByeBye;
@ -254,8 +257,8 @@ VfatMount (PVFAT_IRP_CONTEXT IrpContext)
RtlZeroMemory(DeviceExt, sizeof(DEVICE_EXTENSION));
/* use same vpb as device disk */
DeviceObject->Vpb = IrpContext->Stack->Parameters.MountVolume.DeviceObject->Vpb;
Status = VfatMountDevice(DeviceExt, IrpContext->Stack->Parameters.MountVolume.DeviceObject);
DeviceObject->Vpb = DeviceToMount->Vpb;
Status = VfatMountDevice(DeviceExt, DeviceToMount);
if (!NT_SUCCESS(Status))
{
/* FIXME: delete device object */
@ -275,7 +278,7 @@ VfatMount (PVFAT_IRP_CONTEXT IrpContext)
}
#endif
DeviceExt->StorageDevice = IrpContext->Stack->Parameters.MountVolume.DeviceObject;
DeviceExt->StorageDevice = DeviceToMount;
DeviceExt->StorageDevice->Vpb->DeviceObject = DeviceObject;
DeviceExt->StorageDevice->Vpb->RealDevice = DeviceExt->StorageDevice;
DeviceExt->StorageDevice->Vpb->Flags |= VPB_MOUNTED;
@ -382,16 +385,36 @@ ByeBye:
static NTSTATUS
VfatVerify (PVFAT_IRP_CONTEXT IrpContext)
/*
* FUNCTION: Mount the filesystem
* FUNCTION: Verify the filesystem
*/
{
PDEVICE_OBJECT DeviceToVerify;
NTSTATUS Status;
DPRINT("VfatVerify(IrpContext %x)\n", IrpContext);
assert(IrpContext);
DeviceToVerify = IrpContext->Stack->Parameters.VerifyVolume.DeviceObject;
Status = VfatBlockDeviceIoControl(DeviceToVerify,
IOCTL_DISK_CHECK_VERIFY,
NULL,
0,
NULL,
NULL);
if (!NT_SUCCESS(Status))
{
DPRINT1("VfatBlockDeviceIoControl() failed (Status %lx)\n", Status);
return(STATUS_INVALID_DEVICE_REQUEST);
/* FIXME: Compare volume label */
DPRINT1(" returning STATUS_WRONG_VOLUME\n");
return STATUS_WRONG_VOLUME;
}
return STATUS_SUCCESS;
}
static NTSTATUS
VfatGetVolumeBitmap(PVFAT_IRP_CONTEXT IrpContext)
{
@ -400,6 +423,7 @@ VfatGetVolumeBitmap(PVFAT_IRP_CONTEXT IrpContext)
return STATUS_INVALID_DEVICE_REQUEST;
}
static NTSTATUS
VfatGetRetrievalPointers(PVFAT_IRP_CONTEXT IrpContext)
{