diff options
| author | Ken Brown <kbrown@cornell.edu> | 2020-01-30 10:08:21 -0500 |
|---|---|---|
| committer | Ken Brown <kbrown@cornell.edu> | 2020-01-31 07:45:11 -0500 |
| commit | 76dca77f049271e2529c25de8a396e65dbce615d (patch) | |
| tree | 7eff51d50693565c85041adcae9262955a04ffd9 | |
| parent | 8ef32f2dcfe48b540e64a4ec3ce0dcba5d3b70ce (diff) | |
| download | cygnal-76dca77f049271e2529c25de8a396e65dbce615d.tar.gz cygnal-76dca77f049271e2529c25de8a396e65dbce615d.tar.bz2 cygnal-76dca77f049271e2529c25de8a396e65dbce615d.zip | |
Cygwin: fstat_helper: always use handle in call to get_file_attribute
When fhandler_base::fstat_helper is called, the handle h returned by
get_stat_handle() should be pc.handle() and should be safe to use for
getting the file information. Previously, the call to
get_file_attribute() for FIFOs set the first argument to NULL instead
of h, thereby forcing the file to be opened for fetching the security
descriptor in get_file_sd().
| -rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index f362e31e3..bc5967e18 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -394,12 +394,13 @@ fhandler_base::fstat_fs (struct stat *buf) return res; } +/* Called by fstat_by_handle and fstat_by_name. */ int __reg2 fhandler_base::fstat_helper (struct stat *buf) { IO_STATUS_BLOCK st; FILE_COMPRESSION_INFORMATION fci; - HANDLE h = get_stat_handle (); + HANDLE h = get_stat_handle (); /* Should always be pc.handle(). */ PFILE_ALL_INFORMATION pfai = pc.fai (); ULONG attributes = pc.file_attributes (); @@ -475,8 +476,8 @@ 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) |