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

sys: create: validate FileName only after FileNode->FileName has been constructed

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-10-05 10:27:17 -07:00
parent 352450d538
commit 0a8b8e8444
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/sys/create.c
View File

@ -155,7 +155,6 @@ static NTSTATUS FspFsvolCreateNoLock(
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
UNICODE_STRING MainFileName = { 0 }, StreamPart = { 0 };
PACCESS_STATE AccessState = IrpSp->Parameters.Create.SecurityContext->AccessState; PACCESS_STATE AccessState = IrpSp->Parameters.Create.SecurityContext->AccessState;
ULONG CreateDisposition = (IrpSp->Parameters.Create.Options >> 24) & 0xff; ULONG CreateDisposition = (IrpSp->Parameters.Create.Options >> 24) & 0xff;
ULONG CreateOptions = IrpSp->Parameters.Create.Options; ULONG CreateOptions = IrpSp->Parameters.Create.Options;
@ -179,6 +178,7 @@ static NTSTATUS FspFsvolCreateNoLock(
BooleanFlagOn(AccessState->Flags, TOKEN_HAS_TRAVERSE_PRIVILEGE); BooleanFlagOn(AccessState->Flags, TOKEN_HAS_TRAVERSE_PRIVILEGE);
FSP_FILE_NODE *FileNode, *RelatedFileNode; FSP_FILE_NODE *FileNode, *RelatedFileNode;
FSP_FILE_DESC *FileDesc; FSP_FILE_DESC *FileDesc;
UNICODE_STRING MainFileName = { 0 }, StreamPart = { 0 };
FSP_FSCTL_TRANSACT_REQ *Request; FSP_FSCTL_TRANSACT_REQ *Request;
/* cannot open files by fileid */ /* cannot open files by fileid */
@ -223,23 +223,6 @@ static NTSTATUS FspFsvolCreateNoLock(
FileName.Buffer++; FileName.Buffer++;
} }
/* check filename validity */
if (!FspUnicodePathIsValid(&FileName,
FsvolDeviceExtension->VolumeParams.NamedStreams ? &StreamPart : 0))
return STATUS_OBJECT_NAME_INVALID;
/* if we have a stream part (even non-empty) */
if (0 != StreamPart.Buffer)
{
ASSERT(
(PUINT8)FileName.Buffer + sizeof(WCHAR) <= (PUINT8)StreamPart.Buffer &&
(PUINT8)StreamPart.Buffer + StreamPart.Length <=
(PUINT8)FileName.Buffer + FileName.Length);
FileName.Length = (USHORT)
((PUINT8)StreamPart.Buffer - (PUINT8)FileName.Buffer + StreamPart.Length);
}
/* is this a relative or absolute open? */ /* is this a relative or absolute open? */
if (0 != RelatedFileObject) if (0 != RelatedFileObject)
{ {
@ -291,6 +274,26 @@ static NTSTATUS FspFsvolCreateNoLock(
Result = RtlAppendUnicodeStringToString(&FileNode->FileName, &FileName); Result = RtlAppendUnicodeStringToString(&FileNode->FileName, &FileName);
ASSERT(NT_SUCCESS(Result)); ASSERT(NT_SUCCESS(Result));
/* check filename validity */
if (!FspUnicodePathIsValid(&FileNode->FileName,
FsvolDeviceExtension->VolumeParams.NamedStreams ? &StreamPart : 0))
{
FspFileNodeDereference(FileNode);
return STATUS_OBJECT_NAME_INVALID;
}
/* if we have a stream part (even non-empty), ensure that FileNode->FileName has single colon */
if (0 != StreamPart.Buffer)
{
ASSERT(
(PUINT8)FileNode->FileName.Buffer + sizeof(WCHAR) <= (PUINT8)StreamPart.Buffer &&
(PUINT8)StreamPart.Buffer + StreamPart.Length <=
(PUINT8)FileNode->FileName.Buffer + FileNode->FileName.Length);
FileNode->FileName.Length = (USHORT)
((PUINT8)StreamPart.Buffer - (PUINT8)FileNode->FileName.Buffer + StreamPart.Length);
}
/* check and remove any volume prefix */ /* check and remove any volume prefix */
if (0 == RelatedFileObject && 0 < FsvolDeviceExtension->VolumePrefix.Length) if (0 == RelatedFileObject && 0 < FsvolDeviceExtension->VolumePrefix.Length)
{ {
@ -378,8 +381,8 @@ static NTSTATUS FspFsvolCreateNoLock(
} }
MainFileName.Length = MainFileName.MaximumLength = (USHORT) MainFileName.Length = MainFileName.MaximumLength = (USHORT)
((PUINT8)StreamPart.Buffer - (PUINT8)FileName.Buffer - sizeof(WCHAR)); ((PUINT8)StreamPart.Buffer - (PUINT8)FileNode->FileName.Buffer - sizeof(WCHAR));
MainFileName.Buffer = FileName.Buffer; MainFileName.Buffer = FileNode->FileName.Buffer;
Result = FspMainFileOpen( Result = FspMainFileOpen(
FsvolDeviceObject, FsvolDeviceObject,

2
src/sys/file.c
View File

@ -1299,6 +1299,7 @@ NTSTATUS FspMainFileOpen(
FullFileName.Length = 0; FullFileName.Length = 0;
FullFileName.MaximumLength = FullFileName.MaximumLength =
FsvolDeviceExtension->VolumeName.Length + FsvolDeviceExtension->VolumeName.Length +
FsvolDeviceExtension->VolumePrefix.Length +
MainFileName->Length; MainFileName->Length;
FullFileName.Buffer = FspAlloc(FullFileName.MaximumLength); FullFileName.Buffer = FspAlloc(FullFileName.MaximumLength);
if (0 == FullFileName.Buffer) if (0 == FullFileName.Buffer)
@ -1308,6 +1309,7 @@ NTSTATUS FspMainFileOpen(
} }
RtlAppendUnicodeStringToString(&FullFileName, &FsvolDeviceExtension->VolumeName); RtlAppendUnicodeStringToString(&FullFileName, &FsvolDeviceExtension->VolumeName);
RtlAppendUnicodeStringToString(&FullFileName, &FsvolDeviceExtension->VolumePrefix);
RtlAppendUnicodeStringToString(&FullFileName, MainFileName); RtlAppendUnicodeStringToString(&FullFileName, MainFileName);
InitializeObjectAttributes( InitializeObjectAttributes(