Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-06-07 20:42:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

sys: POSIX rename improvements

Browse Source
This commit is contained in:
Bill Zissimopoulos 2021-11-25 10:35:22 +00:00
parent c4f994f8f6
commit 00219f29cf
No known key found for this signature in database
GPG Key ID: 3D4F95D52C7B3EA3
3 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sys/file.c
View File

@ -1342,7 +1342,7 @@ NTSTATUS FspFileNodeRenameCheck(PDEVICE_OBJECT FsvolDeviceObject, PIRP OplockIrp
* "rename" resource exclusively, which disallows new Opens. * "rename" resource exclusively, which disallows new Opens.
*/ */
if (!PosixRename && !CheckingOldName) if (!CheckingOldName)
{ {
/* replaced file cannot be a directory or mapped as an image */ /* replaced file cannot be a directory or mapped as an image */
for ( for (

6
src/sys/fileinfo.c
View File

@ -1691,6 +1691,12 @@ retry:
FspFsvolDeviceFileRenameAcquireExclusive(FsvolDeviceObject); FspFsvolDeviceFileRenameAcquireExclusive(FsvolDeviceObject);
FspFileNodeAcquireExclusive(FileNode, Full); FspFileNodeAcquireExclusive(FileNode, Full);
if (FileNode->PosixDelete)
{
Result = STATUS_ACCESS_DENIED;
goto unlock_exit;
}
if (0 == Request) if (0 == Request)
{ {
if (0 != TargetFileNode) if (0 != TargetFileNode)

51
tst/winfsp-tests/info-test.c
View File

@ -2049,6 +2049,10 @@ static void rename_ex_dotest(ULONG Flags, PWSTR VolPrefix, PWSTR Prefix, ULONG F
ULONG FileNameLength; ULONG FileNameLength;
WCHAR FileName[1]; WCHAR FileName[1];
} FILE_RENAME_INFORMATION, *PFILE_RENAME_INFORMATION; } FILE_RENAME_INFORMATION, *PFILE_RENAME_INFORMATION;
typedef struct
{
ULONG Flags;
} FILE_DISPOSITION_INFORMATION_EX, *PFILE_DISPOSITION_INFORMATION_EX;
HANDLE Handle0, Handle1, Handle2; HANDLE Handle0, Handle1, Handle2;
WCHAR File0Path[MAX_PATH]; WCHAR File0Path[MAX_PATH];
@ -2058,6 +2062,7 @@ static void rename_ex_dotest(ULONG Flags, PWSTR VolPrefix, PWSTR Prefix, ULONG F
FILE_RENAME_INFORMATION I; FILE_RENAME_INFORMATION I;
UINT8 B[sizeof(FILE_RENAME_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; UINT8 B[sizeof(FILE_RENAME_INFORMATION) + MAX_PATH * sizeof(WCHAR)];
} RenameInfo; } RenameInfo;
FILE_DISPOSITION_INFORMATION_EX DispositionInfo;
IO_STATUS_BLOCK IoStatus; IO_STATUS_BLOCK IoStatus;
StringCbPrintfW(File0Path, sizeof File0Path, L"%s%s\\", StringCbPrintfW(File0Path, sizeof File0Path, L"%s%s\\",
@ -2076,6 +2081,8 @@ static void rename_ex_dotest(ULONG Flags, PWSTR VolPrefix, PWSTR Prefix, ULONG F
StringCbPrintfW(File2Path, sizeof File2Path, L"%s%s\\file2", StringCbPrintfW(File2Path, sizeof File2Path, L"%s%s\\file2",
Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs)); Prefix ? L"" : L"\\\\?\\GLOBALROOT", Prefix ? Prefix : memfs_volumename(memfs));
/* File Test */
Handle0 = CreateFileW(File0Path, Handle0 = CreateFileW(File0Path,
GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0,
CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0); CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0);
@ -2127,6 +2134,16 @@ static void rename_ex_dotest(ULONG Flags, PWSTR VolPrefix, PWSTR Prefix, ULONG F
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
ASSERT(INVALID_HANDLE_VALUE != Handle0); ASSERT(INVALID_HANDLE_VALUE != Handle0);
memset(&RenameInfo.I, 0, sizeof RenameInfo.I);
RenameInfo.I.Flags = 1/*FILE_RENAME_REPLACE_IF_EXISTS*/;
RenameInfo.I.FileNameLength = (ULONG)(wcslen(L"file0") * sizeof(WCHAR));
memcpy(RenameInfo.I.FileName, L"file0", RenameInfo.I.FileNameLength);
IoStatus.Status = NtSetInformationFile(
Handle2, &IoStatus,
&RenameInfo.I, FIELD_OFFSET(FILE_RENAME_INFORMATION, FileName) + RenameInfo.I.FileNameLength,
10/*FileRenameInformation*/);
ASSERT(STATUS_ACCESS_DENIED == IoStatus.Status);
memset(&RenameInfo.I, 0, sizeof RenameInfo.I); memset(&RenameInfo.I, 0, sizeof RenameInfo.I);
RenameInfo.I.Flags = 3/*FILE_RENAME_REPLACE_IF_EXISTS|FILE_RENAME_POSIX_SEMANTICS*/; RenameInfo.I.Flags = 3/*FILE_RENAME_REPLACE_IF_EXISTS|FILE_RENAME_POSIX_SEMANTICS*/;
RenameInfo.I.FileNameLength = (ULONG)(wcslen(L"file0") * sizeof(WCHAR)); RenameInfo.I.FileNameLength = (ULONG)(wcslen(L"file0") * sizeof(WCHAR));
@ -2165,6 +2182,40 @@ static void rename_ex_dotest(ULONG Flags, PWSTR VolPrefix, PWSTR Prefix, ULONG F
Success = DeleteFileW(File0Path); Success = DeleteFileW(File0Path);
ASSERT(Success); ASSERT(Success);
/* Deleted File Test */
Handle0 = CreateFileW(File0Path,
GENERIC_READ | GENERIC_WRITE | DELETE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0,
CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0);
ASSERT(INVALID_HANDLE_VALUE != Handle0);
Handle1 = CreateFileW(File0Path,
DELETE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, 0,
OPEN_EXISTING, 0, 0);
ASSERT(INVALID_HANDLE_VALUE != Handle1);
memset(&DispositionInfo, 0, sizeof DispositionInfo);
DispositionInfo.Flags = 3; /* DELETE | POSIX_SEMANTICS */
IoStatus.Status = NtSetInformationFile(
Handle1, &IoStatus,
&DispositionInfo, sizeof DispositionInfo,
64/*FileDispositionInformationEx*/);
ASSERT(0 == IoStatus.Status);
CloseHandle(Handle1);
memset(&RenameInfo.I, 0, sizeof RenameInfo.I);
RenameInfo.I.Flags = 2/*FILE_RENAME_POSIX_SEMANTICS*/;
RenameInfo.I.FileNameLength = (ULONG)(wcslen(L"file2") * sizeof(WCHAR));
memcpy(RenameInfo.I.FileName, L"file2", RenameInfo.I.FileNameLength);
IoStatus.Status = NtSetInformationFile(
Handle0, &IoStatus,
&RenameInfo.I, FIELD_OFFSET(FILE_RENAME_INFORMATION, FileName) + RenameInfo.I.FileNameLength,
65/*FileRenameInformationEx*/);
ASSERT(STATUS_ACCESS_DENIED == IoStatus.Status);
CloseHandle(Handle0);
} }
memfs_stop(memfs); memfs_stop(memfs);