From 56e7563b9aa665f35b657537e46a7feb4726f763 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 4 Apr 2024 17:36:01 +0200 Subject: Cygwin: FILE_OPEN_NO_RECALL is incompatible with FILE_DIRECTORY_FILE If FILE_DIRECTORY_FILE is given, FILE_OPEN_NO_RECALL is not allowed, otherwise NtCreateFile returns STATUS_INVALID_PARAMETER. Drop FILE_OPEN_NO_RECALL where FILE_DIRECTORY_FILE is specified. Fixes: f6b56abec186 ("Cygwin: try to avoid recalling offline files") Reported-by: Bruce Jerrick Signed-off-by: Corinna Vinschen --- winsup/cygwin/fhandler/disk_file.cc | 1 - winsup/cygwin/path.cc | 2 -- winsup/cygwin/release/3.5.4 | 6 ++++++ 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 winsup/cygwin/release/3.5.4 (limited to 'winsup') diff --git a/winsup/cygwin/fhandler/disk_file.cc b/winsup/cygwin/fhandler/disk_file.cc index 865a05a..724ce7f 100644 --- a/winsup/cygwin/fhandler/disk_file.cc +++ b/winsup/cygwin/fhandler/disk_file.cc @@ -325,7 +325,6 @@ fhandler_base::fstat_by_name (struct stat *buf) status = NtOpenFile (&dir, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_VALID_FLAGS, FILE_SYNCHRONOUS_IO_NONALERT - | FILE_OPEN_NO_RECALL | FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE); if (!NT_SUCCESS (status)) diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index fa5ceea..5cfcbc0 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -608,7 +608,6 @@ getfileattr (const char *path, bool caseinsensitive) /* path has to be always ab status = NtOpenFile (&dir, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_VALID_FLAGS, FILE_SYNCHRONOUS_IO_NONALERT - | FILE_OPEN_NO_RECALL | FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE); if (NT_SUCCESS (status)) @@ -3340,7 +3339,6 @@ restart: status = NtOpenFile (&dir, SYNCHRONIZE | FILE_LIST_DIRECTORY, &dattr, &io, FILE_SHARE_VALID_FLAGS, FILE_SYNCHRONOUS_IO_NONALERT - | FILE_OPEN_NO_RECALL | FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE); if (!NT_SUCCESS (status)) diff --git a/winsup/cygwin/release/3.5.4 b/winsup/cygwin/release/3.5.4 new file mode 100644 index 0000000..e2bd025 --- /dev/null +++ b/winsup/cygwin/release/3.5.4 @@ -0,0 +1,6 @@ +Fixes: +------ + +- Fix regression in 3.5.3 which fails to open files for stat(2) if the + file is opened exclusively by another process. + Addresses: https://cygwin.com/pipermail/cygwin/2024-April/255811.html -- cgit v1.1