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

sys: FspFileNameIsValid, FspFileNameIsValidPattern: check path component length

Browse Source 
tst: memfs: allow filenames to be 512 chars long
This commit is contained in:
Bill Zissimopoulos 2016-12-18 11:51:23 -08:00
parent c780912810
commit 94ea4f65f7
7 changed files with 57 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sys/create.c
View File

@ -299,7 +299,7 @@ static NTSTATUS FspFsvolCreateNoLock(
ASSERT(NT_SUCCESS(Result)); ASSERT(NT_SUCCESS(Result));
/* check filename validity */ /* check filename validity */
if (!FspFileNameIsValid(&FileNode->FileName, if (!FspFileNameIsValid(&FileNode->FileName, FsvolDeviceExtension->VolumeParams.MaxComponentLength,
FsvolDeviceExtension->VolumeParams.NamedStreams ? &StreamPart : 0, FsvolDeviceExtension->VolumeParams.NamedStreams ? &StreamPart : 0,
&StreamType)) &StreamType))
{ {

4
src/sys/dirctl.c
View File

@ -617,6 +617,7 @@ static NTSTATUS FspFsvolQueryDirectory(
return STATUS_INVALID_DEVICE_REQUEST; return STATUS_INVALID_DEVICE_REQUEST;
NTSTATUS Result; NTSTATUS Result;
FSP_FSVOL_DEVICE_EXTENSION *FsvolDeviceExtension = FspFsvolDeviceExtension(FsvolDeviceObject);
PFILE_OBJECT FileObject = IrpSp->FileObject; PFILE_OBJECT FileObject = IrpSp->FileObject;
FSP_FILE_NODE *FileNode = FileObject->FsContext; FSP_FILE_NODE *FileNode = FileObject->FsContext;
FILE_INFORMATION_CLASS FileInformationClass = IrpSp->Parameters.QueryDirectory.FileInformationClass; FILE_INFORMATION_CLASS FileInformationClass = IrpSp->Parameters.QueryDirectory.FileInformationClass;
@ -636,7 +637,8 @@ static NTSTATUS FspFsvolQueryDirectory(
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
/* check that FileName is valid (if supplied) */ /* check that FileName is valid (if supplied) */
if (0 != FileName && !FspFileNameIsValidPattern(FileName)) if (0 != FileName &&
!FspFileNameIsValidPattern(FileName, FsvolDeviceExtension->VolumeParams.MaxComponentLength))
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
/* is this an allowed file information class? */ /* is this an allowed file information class? */

5
src/sys/driver.h
View File

@ -437,8 +437,9 @@ enum
FspFileNameStreamTypeNone = 0, FspFileNameStreamTypeNone = 0,
FspFileNameStreamTypeData = 1, FspFileNameStreamTypeData = 1,
}; };
BOOLEAN FspFileNameIsValid(PUNICODE_STRING Path, PUNICODE_STRING StreamPart, PULONG StreamType); BOOLEAN FspFileNameIsValid(PUNICODE_STRING Path, ULONG MaxComponentLength,
BOOLEAN FspFileNameIsValidPattern(PUNICODE_STRING Pattern); PUNICODE_STRING StreamPart, PULONG StreamType);
BOOLEAN FspFileNameIsValidPattern(PUNICODE_STRING Pattern, ULONG MaxComponentLength);
VOID FspFileNameSuffix(PUNICODE_STRING Path, PUNICODE_STRING Remain, PUNICODE_STRING Suffix); VOID FspFileNameSuffix(PUNICODE_STRING Path, PUNICODE_STRING Remain, PUNICODE_STRING Suffix);
#if 0 #if 0
NTSTATUS FspFileNameUpcase( NTSTATUS FspFileNameUpcase(

4
src/sys/file.c
View File

@ -1911,7 +1911,9 @@ NTSTATUS FspMainFileOpen(
PFILE_OBJECT MainFileObject; PFILE_OBJECT MainFileObject;
/* assert that the supplied name is actually a main file name */ /* assert that the supplied name is actually a main file name */
ASSERT(FspFileNameIsValid(MainFileName, 0, 0)); ASSERT(FspFileNameIsValid(MainFileName,
FsvolDeviceExtension->VolumeParams.MaxComponentLength,
0, 0));
*PMainFileHandle = 0; *PMainFileHandle = 0;
*PMainFileObject = 0; *PMainFileObject = 0;

12
src/sys/fileinfo.c
View File

@ -1170,6 +1170,7 @@ static NTSTATUS FspFsvolSetRenameInformation(
PAGED_CODE(); PAGED_CODE();
NTSTATUS Result; NTSTATUS Result;
FSP_FSVOL_DEVICE_EXTENSION *FsvolDeviceExtension = FspFsvolDeviceExtension(FsvolDeviceObject);
PFILE_OBJECT FileObject = IrpSp->FileObject; PFILE_OBJECT FileObject = IrpSp->FileObject;
PFILE_OBJECT TargetFileObject = IrpSp->Parameters.SetFile.FileObject; PFILE_OBJECT TargetFileObject = IrpSp->Parameters.SetFile.FileObject;
BOOLEAN ReplaceIfExists = IrpSp->Parameters.SetFile.ReplaceIfExists; BOOLEAN ReplaceIfExists = IrpSp->Parameters.SetFile.ReplaceIfExists;
@ -1195,7 +1196,9 @@ static NTSTATUS FspFsvolSetRenameInformation(
if (FileNode->IsRootDirectory) if (FileNode->IsRootDirectory)
/* cannot rename root directory */ /* cannot rename root directory */
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
if (!FspFileNameIsValid(&FileNode->FileName, 0, 0)) if (!FspFileNameIsValid(&FileNode->FileName,
FsvolDeviceExtension->VolumeParams.MaxComponentLength,
0, 0))
/* cannot rename streams (WinFsp limitation) */ /* cannot rename streams (WinFsp limitation) */
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
@ -1229,7 +1232,12 @@ retry:
} }
Suffix.MaximumLength = Suffix.Length; Suffix.MaximumLength = Suffix.Length;
if (!FspFileNameIsValid(&Remain, 0, 0) || !FspFileNameIsValid(&Suffix, 0, 0)) if (!FspFileNameIsValid(&Remain,
FsvolDeviceExtension->VolumeParams.MaxComponentLength,
0, 0) ||
!FspFileNameIsValid(&Suffix,
FsvolDeviceExtension->VolumeParams.MaxComponentLength,
0, 0))
{ {
/* cannot rename streams (WinFsp limitation) */ /* cannot rename streams (WinFsp limitation) */
Result = STATUS_INVALID_PARAMETER; Result = STATUS_INVALID_PARAMETER;

29
src/sys/name.c
View File

@ -17,8 +17,9 @@
#include <sys/driver.h> #include <sys/driver.h>
BOOLEAN FspFileNameIsValid(PUNICODE_STRING Path, PUNICODE_STRING StreamPart, PULONG StreamType); BOOLEAN FspFileNameIsValid(PUNICODE_STRING Path, ULONG MaxComponentLength,
BOOLEAN FspFileNameIsValidPattern(PUNICODE_STRING Pattern); PUNICODE_STRING StreamPart, PULONG StreamType);
BOOLEAN FspFileNameIsValidPattern(PUNICODE_STRING Pattern, ULONG MaxComponentLength);
VOID FspFileNameSuffix(PUNICODE_STRING Path, PUNICODE_STRING Remain, PUNICODE_STRING Suffix); VOID FspFileNameSuffix(PUNICODE_STRING Path, PUNICODE_STRING Remain, PUNICODE_STRING Suffix);
NTSTATUS FspFileNameInExpression( NTSTATUS FspFileNameInExpression(
PUNICODE_STRING Expression, PUNICODE_STRING Expression,
@ -34,7 +35,8 @@ NTSTATUS FspFileNameInExpression(
#pragma alloc_text(PAGE, FspFileNameInExpression) #pragma alloc_text(PAGE, FspFileNameInExpression)
#endif #endif
BOOLEAN FspFileNameIsValid(PUNICODE_STRING Path, PUNICODE_STRING StreamPart, PULONG StreamType) BOOLEAN FspFileNameIsValid(PUNICODE_STRING Path, ULONG MaxComponentLength,
PUNICODE_STRING StreamPart, PULONG StreamType)
{ {
PAGED_CODE(); PAGED_CODE();
@ -44,7 +46,7 @@ BOOLEAN FspFileNameIsValid(PUNICODE_STRING Path, PUNICODE_STRING StreamPart, PUL
if (0 == Path->Length || 0 != Path->Length % sizeof(WCHAR)) if (0 == Path->Length || 0 != Path->Length % sizeof(WCHAR))
return FALSE; return FALSE;
PWSTR PathBgn, PathEnd, PathPtr, StreamTypeStr = 0; PWSTR PathBgn, PathEnd, PathPtr, ComponentPtr, StreamTypeStr = 0;
UCHAR Flags = FSRTL_NTFS_LEGAL; UCHAR Flags = FSRTL_NTFS_LEGAL;
ULONG Colons = 0; ULONG Colons = 0;
WCHAR Char; WCHAR Char;
@ -52,6 +54,7 @@ BOOLEAN FspFileNameIsValid(PUNICODE_STRING Path, PUNICODE_STRING StreamPart, PUL
PathBgn = Path->Buffer; PathBgn = Path->Buffer;
PathEnd = (PWSTR)((PUINT8)PathBgn + Path->Length); PathEnd = (PWSTR)((PUINT8)PathBgn + Path->Length);
PathPtr = PathBgn; PathPtr = PathBgn;
ComponentPtr = PathPtr;
while (PathEnd > PathPtr) while (PathEnd > PathPtr)
{ {
@ -63,7 +66,12 @@ BOOLEAN FspFileNameIsValid(PUNICODE_STRING Path, PUNICODE_STRING StreamPart, PUL
if (0 < Colons) if (0 < Colons)
return FALSE; return FALSE;
/* path component cannot be longer than MaxComponentLength */
if (PathPtr - ComponentPtr > MaxComponentLength)
return FALSE;
PathPtr++; PathPtr++;
ComponentPtr = PathPtr;
/* don't like multiple backslashes */ /* don't like multiple backslashes */
if (PathEnd > PathPtr && L'\\' == *PathPtr) if (PathEnd > PathPtr && L'\\' == *PathPtr)
@ -106,6 +114,10 @@ BOOLEAN FspFileNameIsValid(PUNICODE_STRING Path, PUNICODE_STRING StreamPart, PUL
PathPtr++; PathPtr++;
} }
/* path component cannot be longer than MaxComponentLength */
if (PathPtr - ComponentPtr > MaxComponentLength)
return FALSE;
/* if we had no colons the path is valid */ /* if we had no colons the path is valid */
if (0 == Colons) if (0 == Colons)
return TRUE; return TRUE;
@ -133,19 +145,20 @@ BOOLEAN FspFileNameIsValid(PUNICODE_STRING Path, PUNICODE_STRING StreamPart, PUL
return FALSE; return FALSE;
} }
BOOLEAN FspFileNameIsValidPattern(PUNICODE_STRING Path) BOOLEAN FspFileNameIsValidPattern(PUNICODE_STRING Path, ULONG MaxComponentLength)
{ {
PAGED_CODE(); PAGED_CODE();
if (0 != Path->Length % sizeof(WCHAR)) if (0 != Path->Length % sizeof(WCHAR))
return FALSE; return FALSE;
PWSTR PathBgn, PathEnd, PathPtr; PWSTR PathBgn, PathEnd, PathPtr, ComponentPtr;
WCHAR Char; WCHAR Char;
PathBgn = Path->Buffer; PathBgn = Path->Buffer;
PathEnd = (PWSTR)((PUINT8)PathBgn + Path->Length); PathEnd = (PWSTR)((PUINT8)PathBgn + Path->Length);
PathPtr = PathBgn; PathPtr = PathBgn;
ComponentPtr = PathPtr;
while (PathEnd > PathPtr) while (PathEnd > PathPtr)
{ {
@ -167,6 +180,10 @@ BOOLEAN FspFileNameIsValidPattern(PUNICODE_STRING Path)
PathPtr++; PathPtr++;
} }
/* path component cannot be longer than MaxComponentLength */
if (PathPtr - ComponentPtr > MaxComponentLength)
return FALSE;
return TRUE; return TRUE;
} }

24
tst/memfs/memfs.cpp
View File

@ -23,6 +23,10 @@
#include <map> #include <map>
#include <unordered_map> #include <unordered_map>
#define MEMFS_MAX_PATH 512
FSP_FSCTL_STATIC_ASSERT(MEMFS_MAX_PATH > MAX_PATH,
"MEMFS_MAX_PATH must be greater than MAX_PATH.");
/* /*
* Define the MEMFS_NAME_NORMALIZATION macro to include name normalization support. * Define the MEMFS_NAME_NORMALIZATION macro to include name normalization support.
*/ */
@ -177,7 +181,7 @@ BOOLEAN MemfsFileNameHasPrefix(PWSTR a, PWSTR b, BOOLEAN CaseInsensitive)
typedef struct _MEMFS_FILE_NODE typedef struct _MEMFS_FILE_NODE
{ {
WCHAR FileName[MAX_PATH]; WCHAR FileName[MEMFS_MAX_PATH];
FSP_FSCTL_FILE_INFO FileInfo; FSP_FSCTL_FILE_INFO FileInfo;
SIZE_T FileSecuritySize; SIZE_T FileSecuritySize;
PVOID FileSecurity; PVOID FileSecurity;
@ -343,7 +347,7 @@ MEMFS_FILE_NODE *MemfsFileNodeMapGet(MEMFS_FILE_NODE_MAP *FileNodeMap, PWSTR Fil
static inline static inline
MEMFS_FILE_NODE *MemfsFileNodeMapGetMain(MEMFS_FILE_NODE_MAP *FileNodeMap, PWSTR FileName0) MEMFS_FILE_NODE *MemfsFileNodeMapGetMain(MEMFS_FILE_NODE_MAP *FileNodeMap, PWSTR FileName0)
{ {
WCHAR FileName[MAX_PATH]; WCHAR FileName[MEMFS_MAX_PATH];
wcscpy_s(FileName, sizeof FileName / sizeof(WCHAR), FileName0); wcscpy_s(FileName, sizeof FileName / sizeof(WCHAR), FileName0);
PWSTR StreamName = wcschr(FileName, L':'); PWSTR StreamName = wcschr(FileName, L':');
if (0 == StreamName) if (0 == StreamName)
@ -362,7 +366,7 @@ MEMFS_FILE_NODE *MemfsFileNodeMapGetParent(MEMFS_FILE_NODE_MAP *FileNodeMap, PWS
{ {
WCHAR Root[2] = L"\\"; WCHAR Root[2] = L"\\";
PWSTR Remain, Suffix; PWSTR Remain, Suffix;
WCHAR FileName[MAX_PATH]; WCHAR FileName[MEMFS_MAX_PATH];
wcscpy_s(FileName, sizeof FileName / sizeof(WCHAR), FileName0); wcscpy_s(FileName, sizeof FileName / sizeof(WCHAR), FileName0);
FspPathSuffix(FileName, &Remain, &Suffix, Root); FspPathSuffix(FileName, &Remain, &Suffix, Root);
MEMFS_FILE_NODE_MAP::iterator iter = FileNodeMap->find(Remain); MEMFS_FILE_NODE_MAP::iterator iter = FileNodeMap->find(Remain);
@ -437,11 +441,11 @@ BOOLEAN MemfsFileNodeMapEnumerateChildren(MEMFS_FILE_NODE_MAP *FileNodeMap, MEMF
BOOLEAN IsDirectoryChild; BOOLEAN IsDirectoryChild;
if (0 != PrevFileName0) if (0 != PrevFileName0)
{ {
WCHAR PrevFileName[MAX_PATH]; WCHAR PrevFileName[MEMFS_MAX_PATH];
size_t Length0 = wcslen(FileNode->FileName); size_t Length0 = wcslen(FileNode->FileName);
size_t Length1 = 1 != Length0 || L'\\' != FileNode->FileName[0]; size_t Length1 = 1 != Length0 || L'\\' != FileNode->FileName[0];
size_t Length2 = wcslen(PrevFileName0); size_t Length2 = wcslen(PrevFileName0);
if (MAX_PATH <= Length0 + Length1 + Length2) if (MEMFS_MAX_PATH <= Length0 + Length1 + Length2)
/* fall back to linear scan! */ /* fall back to linear scan! */
goto fallback; goto fallback;
memcpy(PrevFileName, FileNode->FileName, Length0 * sizeof(WCHAR)); memcpy(PrevFileName, FileNode->FileName, Length0 * sizeof(WCHAR));
@ -723,7 +727,7 @@ static NTSTATUS Create(FSP_FILE_SYSTEM *FileSystem,
{ {
MEMFS *Memfs = (MEMFS *)FileSystem->UserContext; MEMFS *Memfs = (MEMFS *)FileSystem->UserContext;
#if defined(MEMFS_NAME_NORMALIZATION) #if defined(MEMFS_NAME_NORMALIZATION)
WCHAR FileNameBuf[MAX_PATH]; WCHAR FileNameBuf[MEMFS_MAX_PATH];
#endif #endif
MEMFS_FILE_NODE *FileNode; MEMFS_FILE_NODE *FileNode;
MEMFS_FILE_NODE *ParentNode; MEMFS_FILE_NODE *ParentNode;
@ -731,7 +735,7 @@ static NTSTATUS Create(FSP_FILE_SYSTEM *FileSystem,
NTSTATUS Result; NTSTATUS Result;
BOOLEAN Inserted; BOOLEAN Inserted;
if (MAX_PATH <= wcslen(FileName)) if (MEMFS_MAX_PATH <= wcslen(FileName))
return STATUS_OBJECT_NAME_INVALID; return STATUS_OBJECT_NAME_INVALID;
if (CreateOptions & FILE_DIRECTORY_FILE) if (CreateOptions & FILE_DIRECTORY_FILE)
@ -765,7 +769,7 @@ static NTSTATUS Create(FSP_FILE_SYSTEM *FileSystem,
RemainLength = wcslen(ParentNode->FileName); RemainLength = wcslen(ParentNode->FileName);
BSlashLength = 1 < RemainLength; BSlashLength = 1 < RemainLength;
SuffixLength = wcslen(Suffix); SuffixLength = wcslen(Suffix);
if (MAX_PATH <= RemainLength + BSlashLength + SuffixLength) if (MEMFS_MAX_PATH <= RemainLength + BSlashLength + SuffixLength)
return STATUS_OBJECT_NAME_INVALID; return STATUS_OBJECT_NAME_INVALID;
memcpy(FileNameBuf, ParentNode->FileName, RemainLength * sizeof(WCHAR)); memcpy(FileNameBuf, ParentNode->FileName, RemainLength * sizeof(WCHAR));
@ -866,7 +870,7 @@ static NTSTATUS Open(FSP_FILE_SYSTEM *FileSystem,
MEMFS_DIR_DESC *DirDesc = 0; MEMFS_DIR_DESC *DirDesc = 0;
NTSTATUS Result; NTSTATUS Result;
if (MAX_PATH <= wcslen(FileName)) if (MEMFS_MAX_PATH <= wcslen(FileName))
return STATUS_OBJECT_NAME_INVALID; return STATUS_OBJECT_NAME_INVALID;
FileNode = MemfsFileNodeMapGet(Memfs->FileNodeMap, FileName); FileNode = MemfsFileNodeMapGet(Memfs->FileNodeMap, FileName);
@ -1216,7 +1220,7 @@ static NTSTATUS Rename(FSP_FILE_SYSTEM *FileSystem,
for (Index = 0; Context.Count > Index; Index++) for (Index = 0; Context.Count > Index; Index++)
{ {
DescendantFileNode = Context.FileNodes[Index]; DescendantFileNode = Context.FileNodes[Index];
if (MAX_PATH <= wcslen(DescendantFileNode->FileName) - FileNameLen + NewFileNameLen) if (MEMFS_MAX_PATH <= wcslen(DescendantFileNode->FileName) - FileNameLen + NewFileNameLen)
{ {
Result = STATUS_OBJECT_NAME_INVALID; Result = STATUS_OBJECT_NAME_INVALID;
goto exit; goto exit;