Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-24 01:13:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

sys: IRP_MJ_CREATE: improve FsContext handling

Browse Source
This commit is contained in:
Bill Zissimopoulos 2015-12-09 16:13:03 -08:00
parent b5f41f0475
commit 75471b2338
1 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/sys/create.c
View File

@ -32,9 +32,8 @@ FSP_DRIVER_DISPATCH FspCreate;
enum enum
{ {
ContextFileObject = 0, RequestFsContext = 0,
ContextFsContext, RequestAccessToken,
ContextAccessToken,
}; };
static NTSTATUS FspFsctlCreate( static NTSTATUS FspFsctlCreate(
@ -276,10 +275,9 @@ static NTSTATUS FspFsvolCreate(
/* /*
* The new request is associated with our IRP and will be deleted during its completion. * The new request is associated with our IRP and will be deleted during its completion.
* Go ahead and associate the FileObject and FsContext with the Request as well. * Go ahead and associate our FsContext with the Request as well.
*/ */
FspIopRequestContext(Request, ContextFileObject) = FileObject; FspIopRequestContext(Request, RequestFsContext) = FsContext;
FspIopRequestContext(Request, ContextFsContext) = FsContext;
/* populate the Create request */ /* populate the Create request */
Request->Kind = FspFsctlTransactCreateKind; Request->Kind = FspFsctlTransactCreateKind;
@ -315,8 +313,6 @@ static NTSTATUS FspFsvolCreate(
RtlCopyMemory(Request->Buffer + Request->Req.Create.SecurityDescriptor.Offset, RtlCopyMemory(Request->Buffer + Request->Req.Create.SecurityDescriptor.Offset,
SecurityDescriptor, SecurityDescriptorSize); SecurityDescriptor, SecurityDescriptorSize);
FileObject->FsContext = FsContext;
Result = STATUS_PENDING; Result = STATUS_PENDING;
exit:; exit:;
@ -355,7 +351,7 @@ NTSTATUS FspFsvolCreatePrepare(
FSP_RETURN(); FSP_RETURN();
/* send the user-mode handle to the user-mode file system */ /* send the user-mode handle to the user-mode file system */
FspIopRequestContext(Request, ContextAccessToken) = UserModeAccessToken; FspIopRequestContext(Request, RequestAccessToken) = UserModeAccessToken;
Request->Req.Create.AccessToken = (UINT_PTR)UserModeAccessToken; Request->Req.Create.AccessToken = (UINT_PTR)UserModeAccessToken;
FSP_LEAVE_IOP(); FSP_LEAVE_IOP();
@ -382,8 +378,8 @@ VOID FspFsvolCreateComplete(
PDEVICE_OBJECT DeviceObject = IrpSp->DeviceObject; PDEVICE_OBJECT DeviceObject = IrpSp->DeviceObject;
FSP_FSVOL_DEVICE_EXTENSION *FsvolDeviceExtension = FspFsvolDeviceExtension(DeviceObject); FSP_FSVOL_DEVICE_EXTENSION *FsvolDeviceExtension = FspFsvolDeviceExtension(DeviceObject);
FSP_FSVRT_DEVICE_EXTENSION *FsvrtDeviceExtension = PDEVICE_OBJECT FsvrtDeviceObject = FsvolDeviceExtension->FsvrtDeviceObject;
FspFsvrtDeviceExtension(FsvolDeviceExtension->FsvrtDeviceObject); FSP_FSVRT_DEVICE_EXTENSION *FsvrtDeviceExtension = FspFsvrtDeviceExtension(FsvrtDeviceObject);
FSP_FSCTL_TRANSACT_REQ *Request = FspIopRequest(Irp); FSP_FSCTL_TRANSACT_REQ *Request = FspIopRequest(Irp);
PFILE_OBJECT FileObject = IrpSp->FileObject; PFILE_OBJECT FileObject = IrpSp->FileObject;
PACCESS_STATE AccessState = IrpSp->Parameters.Create.SecurityContext->AccessState; PACCESS_STATE AccessState = IrpSp->Parameters.Create.SecurityContext->AccessState;
@ -399,7 +395,7 @@ VOID FspFsvolCreateComplete(
ULONG Flags = IrpSp->Flags; ULONG Flags = IrpSp->Flags;
KPROCESSOR_MODE RequestorMode = KPROCESSOR_MODE RequestorMode =
FlagOn(Flags, SL_FORCE_ACCESS_CHECK) ? UserMode : Irp->RequestorMode; FlagOn(Flags, SL_FORCE_ACCESS_CHECK) ? UserMode : Irp->RequestorMode;
FSP_FILE_CONTEXT *FsContext = FileObject->FsContext; FSP_FILE_CONTEXT *FsContext = FspIopRequestContext(Request, RequestFsContext);
ACCESS_MASK GrantedAccess; ACCESS_MASK GrantedAccess;
BOOLEAN Inserted = FALSE; BOOLEAN Inserted = FALSE;
@ -453,10 +449,6 @@ VOID FspFsvolCreateComplete(
FSP_RETURN(); FSP_RETURN();
} }
/* record the user-mode file system contexts */
FsContext->UserContext = Response->Rsp.Create.Opened.UserContext;
FileObject->FsContext2 = (PVOID)(UINT_PTR)Response->Rsp.Create.Opened.UserContext2;
/* are we doing access checks? */ /* are we doing access checks? */
if (!FsvrtDeviceExtension->VolumeParams.NoSystemAccessCheck) if (!FsvrtDeviceExtension->VolumeParams.NoSystemAccessCheck)
{ {
@ -610,18 +602,24 @@ VOID FspFsvolCreateComplete(
} }
/* /*
* Looks like SUCCESS! Disassociate our FileObject and FileObject->FsContext from the Request. * Looks like SUCCESS!
*/ */
FspIopRequestContext(Request, ContextFileObject) = 0;
FspIopRequestContext(Request, ContextFsContext) = 0; /* record the user-mode file system contexts */
FsContext->UserContext = Response->Rsp.Create.Opened.UserContext;
FileObject->FsContext = FsContext;
FileObject->FsContext2 = (PVOID)(UINT_PTR)Response->Rsp.Create.Opened.UserContext2;
/* did an FsContext with the same UserContext already exist? */ /* did an FsContext with the same UserContext already exist? */
if (!Inserted) if (!Inserted)
{ /* delete the newly created FsContext as it is not being used */
/* delete the newly created FsContext and use the existing one */ FspFileContextRelease(FspIopRequestContext(Request, RequestFsContext));
FspFileContextRelease(FileObject->FsContext);
FileObject->FsContext = FsContext; /* disassociate our FsContext from the Request */
} FspIopRequestContext(Request, RequestFsContext) = 0;
/* finish seting up the FileObject */
FileObject->Vpb = FsvrtDeviceObject->Vpb;
/* SUCCESS! */ /* SUCCESS! */
Irp->IoStatus.Information = Response->IoStatus.Information; Irp->IoStatus.Information = Response->IoStatus.Information;
@ -662,10 +660,10 @@ static VOID FspFsvolCreateCleanupClose(
FSP_FSVOL_DEVICE_EXTENSION *FsvolDeviceExtension = FspFsvolDeviceExtension(DeviceObject); FSP_FSVOL_DEVICE_EXTENSION *FsvolDeviceExtension = FspFsvolDeviceExtension(DeviceObject);
FSP_FSVRT_DEVICE_EXTENSION *FsvrtDeviceExtension = FSP_FSVRT_DEVICE_EXTENSION *FsvrtDeviceExtension =
FspFsvrtDeviceExtension(FsvolDeviceExtension->FsvrtDeviceObject); FspFsvrtDeviceExtension(FsvolDeviceExtension->FsvrtDeviceObject);
PFILE_OBJECT FileObject = IrpSp->FileObject; FSP_FSCTL_TRANSACT_REQ *OriginalRequest = FspIopRequest(Irp);
FSP_FILE_CONTEXT *FsContext = FileObject->FsContext; FSP_FILE_CONTEXT *FsContext = FspIopRequestContext(OriginalRequest, RequestFsContext);
UINT64 UserContext = FsContext->UserContext; UINT64 UserContext = Response->Rsp.Create.Opened.UserContext;
UINT64 UserContext2 = (UINT_PTR)FileObject->FsContext2; UINT64 UserContext2 = Response->Rsp.Create.Opened.UserContext2;
BOOLEAN FileNameRequired = 0 != FsvrtDeviceExtension->VolumeParams.FileNameRequired; BOOLEAN FileNameRequired = 0 != FsvrtDeviceExtension->VolumeParams.FileNameRequired;
FSP_FSCTL_TRANSACT_REQ *Request; FSP_FSCTL_TRANSACT_REQ *Request;
@ -702,23 +700,18 @@ VOID FspFsvolCreateRequestFini(PVOID Context[3])
{ {
PAGED_CODE(); PAGED_CODE();
if (0 != Context[ContextFsContext]) if (0 != Context[RequestFsContext])
{ FspFileContextRelease(Context[RequestFsContext]);
PFILE_OBJECT FileObject = Context[ContextFileObject];
if (0 != FileObject && FileObject->FsContext == Context[ContextFsContext])
FileObject->FsContext = 0;
FspFileContextRelease(Context[ContextFsContext]);
}
if (0 != Context[ContextAccessToken]) if (0 != Context[RequestAccessToken])
{ {
#if DBG #if DBG
NTSTATUS Result0; NTSTATUS Result0;
Result0 = ObCloseHandle(Context[ContextAccessToken], KernelMode); Result0 = ObCloseHandle(Context[RequestAccessToken], KernelMode);
if (!NT_SUCCESS(Result0)) if (!NT_SUCCESS(Result0))
DEBUGLOG("ObCloseHandle() = %s", NtStatusSym(Result0)); DEBUGLOG("ObCloseHandle() = %s", NtStatusSym(Result0));
#else #else
ObCloseHandle(Context[ContextAccessToken], KernelMode); ObCloseHandle(Context[RequestAccessToken], KernelMode);
#endif #endif
} }
} }