Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-22 16:33:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

sys: FspFsvolDeviceEnumerateContextByName, FspFileNodeRename: bugfix: properly enumerate/rename streams

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-11-16 14:34:01 -08:00
parent 358db2a54f
commit 8750451e10
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sys/device.c
View File

@ -635,7 +635,8 @@ PVOID FspFsvolDeviceEnumerateContextByName(PDEVICE_OBJECT DeviceObject, PUNICODE
if (0 != Result && if (0 != Result &&
FspFileNameIsPrefix(FileName, Result->FileName, CaseInsensitive, 0) && FspFileNameIsPrefix(FileName, Result->FileName, CaseInsensitive, 0) &&
FileName->Length < Result->FileName->Length && FileName->Length < Result->FileName->Length &&
'\\' == Result->FileName->Buffer[FileName->Length / sizeof(WCHAR)]) (L'\\' == Result->FileName->Buffer[FileName->Length / sizeof(WCHAR)] ||
L':' == Result->FileName->Buffer[FileName->Length / sizeof(WCHAR)]))
return Result->Context; return Result->Context;
else else
return 0; return 0;

8
src/sys/file.c
View File

@ -1033,7 +1033,7 @@ VOID FspFileNodeRename(FSP_FILE_NODE *FileNode, PUNICODE_STRING NewFileName)
FSP_FILE_NODE *DescendantFileNodeArray[16], **DescendantFileNodes; FSP_FILE_NODE *DescendantFileNodeArray[16], **DescendantFileNodes;
ULONG DescendantFileNodeCount, DescendantFileNodeIndex; ULONG DescendantFileNodeCount, DescendantFileNodeIndex;
FSP_DEVICE_CONTEXT_BY_NAME_TABLE_RESTART_KEY RestartKey; FSP_DEVICE_CONTEXT_BY_NAME_TABLE_RESTART_KEY RestartKey;
BOOLEAN Deleted, Inserted; BOOLEAN Deleted, Inserted, AcquireForeign;
USHORT FileNameLength; USHORT FileNameLength;
PWSTR ExternalFileName; PWSTR ExternalFileName;
@ -1085,7 +1085,9 @@ VOID FspFileNodeRename(FSP_FILE_NODE *FileNode, PUNICODE_STRING NewFileName)
DescendantFileNode = DescendantFileNodes[DescendantFileNodeIndex]; DescendantFileNode = DescendantFileNodes[DescendantFileNodeIndex];
ASSERT(DescendantFileNode->FileName.Length >= FileNameLength); ASSERT(DescendantFileNode->FileName.Length >= FileNameLength);
if (0 != DescendantFileNodeIndex) AcquireForeign = DescendantFileNode->FileName.Length > FileNameLength &&
L'\\' == DescendantFileNode->FileName.Buffer[FileNameLength / sizeof(WCHAR)];
if (AcquireForeign)
FspFileNodeAcquireExclusiveForeign(DescendantFileNode); FspFileNodeAcquireExclusiveForeign(DescendantFileNode);
FspFsvolDeviceDeleteContextByName(FsvolDeviceObject, &DescendantFileNode->FileName, &Deleted); FspFsvolDeviceDeleteContextByName(FsvolDeviceObject, &DescendantFileNode->FileName, &Deleted);
@ -1115,7 +1117,7 @@ VOID FspFileNodeRename(FSP_FILE_NODE *FileNode, PUNICODE_STRING NewFileName)
&DescendantFileNode->ContextByNameElementStorage, &Inserted); &DescendantFileNode->ContextByNameElementStorage, &Inserted);
ASSERT(Inserted); ASSERT(Inserted);
if (0 != DescendantFileNodeIndex) if (AcquireForeign)
FspFileNodeReleaseForeign(DescendantFileNode); FspFileNodeReleaseForeign(DescendantFileNode);
} }

15
tst/winfsp-tests/stream-tests.c
View File

@ -1393,7 +1393,7 @@ static void stream_rename_flipflop_dotest(ULONG Flags, PWSTR Prefix, ULONG FileI
{ {
void *memfs = memfs_start_ex(Flags, FileInfoTimeout); void *memfs = memfs_start_ex(Flags, FileInfoTimeout);
HANDLE Handle, Mappings[80]; HANDLE Handle, Mappings[80], DirStreamMapping;
BOOL Success; BOOL Success;
WCHAR FilePath[MAX_PATH]; WCHAR FilePath[MAX_PATH];
WCHAR FilePath2[MAX_PATH]; WCHAR FilePath2[MAX_PATH];
@ -1408,6 +1408,16 @@ static void stream_rename_flipflop_dotest(ULONG Flags, PWSTR Prefix, ULONG FileI
Success = CreateDirectoryW(FilePath, 0); Success = CreateDirectoryW(FilePath, 0);
ASSERT(Success); ASSERT(Success);
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\short:dirstrm",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
Handle = CreateFileW(FilePath, GENERIC_ALL, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
ASSERT(INVALID_HANDLE_VALUE != Handle);
DirStreamMapping = CreateFileMappingW(Handle, 0, PAGE_READWRITE,
0, SystemInfo.dwAllocationGranularity, 0);
ASSERT(0 != DirStreamMapping);
Success = CloseHandle(Handle);
ASSERT(Success);
StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\short\\subdir", StringCbPrintfW(FilePath, sizeof FilePath, L"%s%s\\short\\subdir",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
Success = CreateDirectoryW(FilePath, 0); Success = CreateDirectoryW(FilePath, 0);
@ -1452,6 +1462,9 @@ static void stream_rename_flipflop_dotest(ULONG Flags, PWSTR Prefix, ULONG FileI
ASSERT(Success); ASSERT(Success);
} }
Success = CloseHandle(DirStreamMapping);
ASSERT(Success);
for (ULONG j = 1; NumMappings >= j; j++) for (ULONG j = 1; NumMappings >= j; j++)
{ {
if (NumMappings / 2 >= j) if (NumMappings / 2 >= j)