ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Forbid deleting files with an open mapping. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Qian Hong 2021-06-25 00:28:49 -05:00 committed by Alexandre Julliard
parent 7316122011
commit 73d0bb7740
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/ntdll/tests/file.c
View File

@ -3329,14 +3329,14 @@ todo_wine
fdi.DoDeleteFile = TRUE; fdi.DoDeleteFile = TRUE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation );
todo_wine ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res );
res = GetFileAttributesA( buffer ); res = GetFileAttributesA( buffer );
ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" ); ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" );
CloseHandle( mapping ); CloseHandle( mapping );
CloseHandle( handle ); CloseHandle( handle );
res = DeleteFileA( buffer ); res = DeleteFileA( buffer );
todo_wine ok( res, "got error %u\n", GetLastError() ); ok( res, "got error %u\n", GetLastError() );
GetTempFileNameA( tmp_path, "dis", 0, buffer ); GetTempFileNameA( tmp_path, "dis", 0, buffer );
handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 );
@ -3373,14 +3373,14 @@ todo_wine
fdi.DoDeleteFile = TRUE; fdi.DoDeleteFile = TRUE;
res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation ); res = pNtSetInformationFile( handle, &io, &fdi, sizeof(fdi), FileDispositionInformation );
todo_wine ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res ); ok( res == STATUS_CANNOT_DELETE, "got %#x\n", res );
res = GetFileAttributesA( buffer ); res = GetFileAttributesA( buffer );
ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" ); ok( res != INVALID_FILE_ATTRIBUTES, "expected file to exist\n" );
UnmapViewOfFile( view ); UnmapViewOfFile( view );
CloseHandle( handle ); CloseHandle( handle );
res = DeleteFileA( buffer ); res = DeleteFileA( buffer );
todo_wine ok( res, "got error %u\n", GetLastError() ); ok( res, "got error %u\n", GetLastError() );
GetTempFileNameA( tmp_path, "dis", 0, buffer ); GetTempFileNameA( tmp_path, "dis", 0, buffer );
handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); handle = CreateFileA( buffer, GENERIC_READ | GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 );

11
server/fd.c
View File

@ -2452,6 +2452,17 @@ static void set_fd_disposition( struct fd *fd, int unlink )
if (unlink) if (unlink)
{ {
struct fd *fd_ptr;
LIST_FOR_EACH_ENTRY( fd_ptr, &fd->inode->open, struct fd, inode_entry )
{
if (fd_ptr->access & FILE_MAPPING_ACCESS)
{
set_error( STATUS_CANNOT_DELETE );
return;
}
}
if (fstat( fd->unix_fd, &st ) == -1) if (fstat( fd->unix_fd, &st ) == -1)
{ {
file_set_error(); file_set_error();