This commit is contained in:
Bill Zissimopoulos 2016-01-03 16:47:33 -08:00
parent f2f9e9f94b
commit 675559118d
3 changed files with 27 additions and 24 deletions

View File

@ -50,6 +50,10 @@ typedef struct _FSP_FILE_SYSTEM_INTERFACE
PWSTR, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, SIZE_T *); PWSTR, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, SIZE_T *);
NTSTATUS (*FileCreate)(FSP_FILE_SYSTEM *, NTSTATUS (*FileCreate)(FSP_FILE_SYSTEM *,
FSP_FSCTL_TRANSACT_REQ *, FSP_FILE_NODE **FileNode); FSP_FSCTL_TRANSACT_REQ *, FSP_FILE_NODE **FileNode);
NTSTATUS (*FileOpen)(FSP_FILE_SYSTEM *,
FSP_FSCTL_TRANSACT_REQ *, FSP_FILE_NODE **FileNode);
NTSTATUS (*FileClose)(FSP_FILE_SYSTEM *,
FSP_FSCTL_TRANSACT_REQ *, FSP_FILE_NODE *FileNode);
} FSP_FILE_SYSTEM_INTERFACE; } FSP_FILE_SYSTEM_INTERFACE;
typedef struct _FSP_FILE_SYSTEM typedef struct _FSP_FILE_SYSTEM
{ {
@ -144,7 +148,7 @@ FSP_API NTSTATUS FspAccessCheck(FSP_FILE_SYSTEM *FileSystem,
FSP_FSCTL_TRANSACT_REQ *Request, BOOLEAN AllowTraverseCheck, DWORD DesiredAccess, FSP_FSCTL_TRANSACT_REQ *Request, BOOLEAN AllowTraverseCheck, DWORD DesiredAccess,
PDWORD PGrantedAccess); PDWORD PGrantedAccess);
FSP_API NTSTATUS FspShareCheck(FSP_FILE_SYSTEM *FileSystem, FSP_API NTSTATUS FspShareCheck(FSP_FILE_SYSTEM *FileSystem,
FSP_FSCTL_TRANSACT_REQ *Request, FSP_FILE_NODE *FileNode); DWORD GrantedAccess, DWORD ShareAccess, FSP_FILE_NODE *FileNode);
/* /*
* Path Handling * Path Handling

View File

@ -119,17 +119,15 @@ exit:
} }
FSP_API NTSTATUS FspShareCheck(FSP_FILE_SYSTEM *FileSystem, FSP_API NTSTATUS FspShareCheck(FSP_FILE_SYSTEM *FileSystem,
FSP_FSCTL_TRANSACT_REQ *Request, FSP_FILE_NODE *FileNode) DWORD GrantedAccess, DWORD ShareAccess, FSP_FILE_NODE *FileNode)
{ {
DWORD DesiredAccess = Request->Req.Create.DesiredAccess;
DWORD ShareAccess = Request->Req.Create.ShareAccess;
BOOLEAN ReadAccess, WriteAccess, DeleteAccess; BOOLEAN ReadAccess, WriteAccess, DeleteAccess;
BOOLEAN SharedRead, SharedWrite, SharedDelete; BOOLEAN SharedRead, SharedWrite, SharedDelete;
ULONG OpenCount; ULONG OpenCount;
ReadAccess = 0 != (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)); ReadAccess = 0 != (GrantedAccess & (FILE_READ_DATA | FILE_EXECUTE));
WriteAccess = 0 != (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)); WriteAccess = 0 != (GrantedAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA));
DeleteAccess = 0 != (DesiredAccess & DELETE); DeleteAccess = 0 != (GrantedAccess & DELETE);
if (ReadAccess || WriteAccess || DeleteAccess) if (ReadAccess || WriteAccess || DeleteAccess)
{ {

View File

@ -28,9 +28,8 @@ static NTSTATUS FspFileSystemOpCreate_FileCreate(FSP_FILE_SYSTEM *FileSystem,
if (!NT_SUCCESS(Result)) if (!NT_SUCCESS(Result))
return FspFileSystemSendResponseWithStatus(FileSystem, Request, Result); return FspFileSystemSendResponseWithStatus(FileSystem, Request, Result);
Result = FspShareCheck(FileSystem, Request, FileNode); memset(&FileNode->ShareAccess, 0, sizeof FileNode->ShareAccess);
if (!NT_SUCCESS(Result)) FspShareCheck(FileSystem, GrantedAccess, Request->Req.Create.ShareAccess, FileNode);
return FspFileSystemSendResponseWithStatus(FileSystem, Request, Result);
memset(&Response, 0, sizeof Response); memset(&Response, 0, sizeof Response);
Response.Size = sizeof Response; Response.Size = sizeof Response;
@ -46,26 +45,29 @@ static NTSTATUS FspFileSystemOpCreate_FileCreate(FSP_FILE_SYSTEM *FileSystem,
static NTSTATUS FspFileSystemOpCreate_FileOpen(FSP_FILE_SYSTEM *FileSystem, static NTSTATUS FspFileSystemOpCreate_FileOpen(FSP_FILE_SYSTEM *FileSystem,
FSP_FSCTL_TRANSACT_REQ *Request) FSP_FSCTL_TRANSACT_REQ *Request)
{ {
return STATUS_NOT_IMPLEMENTED; if (0 == FileSystem->Interface->FileOpen)
#if 0 return FspFileSystemSendResponseWithStatus(FileSystem, Request, STATUS_NOT_IMPLEMENTED);
NTSTATUS Result; NTSTATUS Result;
DWORD GrantedAccess; DWORD GrantedAccess;
PVOID File; FSP_FILE_NODE *FileNode;
FSP_FSCTL_TRANSACT_RSP Response; FSP_FSCTL_TRANSACT_RSP Response;
Result = FspAccessCheck(FileSystem, Request, FALSE, &GrantedAccess); Result = FspAccessCheck(FileSystem, Request, TRUE,
Request->Req.Create.DesiredAccess, &GrantedAccess);
if (!NT_SUCCESS(Result)) if (!NT_SUCCESS(Result))
return FspSendResponseWithStatus(FileSystem, Request, Result); return FspFileSystemSendResponseWithStatus(FileSystem, Request, Result);
Result = FileSystem->FileOpen(FileSystem, Request, &File); Result = FileSystem->Interface->FileOpen(FileSystem, Request, &FileNode);
if (!NT_SUCCESS(Result)) if (!NT_SUCCESS(Result))
return FspSendResponseWithStatus(FileSystem, Request, Result); return FspFileSystemSendResponseWithStatus(FileSystem, Request, Result);
Result = FspShareCheck(FileSystem, Request, GrantedAccess, File); Result = FspShareCheck(FileSystem, GrantedAccess, Request->Req.Create.ShareAccess, FileNode);
if (!NT_SUCCESS(Result)) if (!NT_SUCCESS(Result))
{ {
FileSystem->FileCleanupClose(FileSystem, Request, File); if (0 != FileSystem->Interface->FileClose)
return FspSendResponseWithStatus(FileSystem, Request, Result); FileSystem->Interface->FileClose(FileSystem, Request, FileNode);
return FspFileSystemSendResponseWithStatus(FileSystem, Request, Result);
} }
memset(&Response, 0, sizeof Response); memset(&Response, 0, sizeof Response);
@ -73,11 +75,10 @@ static NTSTATUS FspFileSystemOpCreate_FileOpen(FSP_FILE_SYSTEM *FileSystem,
Response.Kind = Request->Kind; Response.Kind = Request->Kind;
Response.Hint = Request->Hint; Response.Hint = Request->Hint;
Response.IoStatus.Status = STATUS_SUCCESS; Response.IoStatus.Status = STATUS_SUCCESS;
Response.IoStatus.Information = FILE_CREATED; Response.IoStatus.Information = FILE_OPENED;
Response.Rsp.Create.Opened.UserContext = (UINT_PTR)File; Response.Rsp.Create.Opened.UserContext = (UINT_PTR)FileNode;
Response.Rsp.Create.Opened.GrantedAccess = GrantedAccess; Response.Rsp.Create.Opened.GrantedAccess = GrantedAccess;
return FspSendResponse(FileSystem, &Response); return FspFileSystemSendResponse(FileSystem, &Response);
#endif
} }
static NTSTATUS FspFileSystemOpCreate_FileOpenIf(FSP_FILE_SYSTEM *FileSystem, static NTSTATUS FspFileSystemOpCreate_FileOpenIf(FSP_FILE_SYSTEM *FileSystem,