summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Brown <kbrown@cornell.edu>2021-02-10 21:15:20 -0500
committerKen Brown <kbrown@cornell.edu>2021-02-19 13:43:33 -0500
commit70f63608699321fed8e3501469e5a8a3c416186d (patch)
treefe7e63d4c02c65ccdb44e0e12249be758ea81c73
parente67679fcac44be77bd0be880e9a938b9f300f2dd (diff)
downloadcygnal-70f63608699321fed8e3501469e5a8a3c416186d.tar.gz
cygnal-70f63608699321fed8e3501469e5a8a3c416186d.tar.bz2
cygnal-70f63608699321fed8e3501469e5a8a3c416186d.zip
Cygwin: fstat_helper: always use handle in call to get_file_attribute
Previously, the call to get_file_attribute for FIFOs set the first argument to NULL instead of the handle h returned by get_stat_handle, thereby forcing the file to be opened for fetching the security descriptor in get_file_sd(). This was done because h might have been a pipe handle rather than a file handle, and its permissions would not necessarily reflect those of the file. That situation can no longer occur with the new fhandler_fifo::fstat introduced in the previous commit.
-rw-r--r--winsup/cygwin/fhandler_disk_file.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index ef9171bbf..6170427b0 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -475,8 +475,7 @@ fhandler_base::fstat_helper (struct stat *buf)
else if (pc.issocket ())
buf->st_mode = S_IFSOCK;
- if (!get_file_attribute (is_fs_special () && !pc.issocket () ? NULL : h, pc,
- &buf->st_mode, &buf->st_uid, &buf->st_gid))
+ if (!get_file_attribute (h, pc, &buf->st_mode, &buf->st_uid, &buf->st_gid))
{
/* If read-only attribute is set, modify ntsec return value */
if (::has_attribute (attributes, FILE_ATTRIBUTE_READONLY)