drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: fix fstatvfs on sockets that are not socket files 

If fstatvfs(2) is called on an AF_LOCAL or AF_UNIX socket that is not
a socket file, the current code calls fhandler_disk_file::fstatvfs in
most cases.  The latter expects to be operating on a disk file and
uses the socket's io_handle, which is not a file handle.

Fix this by calling fhandler_disk_file::fstatvfs only if the
fhandler_socket object is a socket file (determined by testing
dev().isfs()).
This commit is contained in:
Ken Brown 2021-02-22 09:21:00 -05:00
parent 2f24c0b993
commit 8889d21010
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/fhandler_socket_local.cc
View File

@ -690,8 +690,11 @@ fhandler_socket_local::fstat (struct stat *buf)
int __reg2 int __reg2
fhandler_socket_local::fstatvfs (struct statvfs *sfs) fhandler_socket_local::fstatvfs (struct statvfs *sfs)
{ {
if (get_sun_path () && get_sun_path ()[0] == '\0') if (!dev ().isfs ())
/* fstatvfs called on a socket. */
return fhandler_socket_wsock::fstatvfs (sfs); return fhandler_socket_wsock::fstatvfs (sfs);
/* statvfs on a socket file or fstatvfs on a socket opened w/ O_PATH. */
if (get_flags () & O_PATH) if (get_flags () & O_PATH)
/* We already have a handle. */ /* We already have a handle. */
{ {

14
winsup/cygwin/fhandler_socket_unix.cc
View File

@ -2354,10 +2354,18 @@ fhandler_socket_unix::fstat (struct stat *buf)
int __reg2 int __reg2
fhandler_socket_unix::fstatvfs (struct statvfs *sfs) fhandler_socket_unix::fstatvfs (struct statvfs *sfs)
{ {
if (sun_path () if (!dev ().isfs ())
&& (sun_path ()->un_len <= (socklen_t) sizeof (sa_family_t) /* fstatvfs called on a socket. */
|| sun_path ()->un.sun_path[0] == '\0'))
return fhandler_socket::fstatvfs (sfs); return fhandler_socket::fstatvfs (sfs);
/* statvfs on a socket file or fstatvfs on a socket opened w/ O_PATH. */
if (get_flags () & O_PATH)
/* We already have a handle. */
{
HANDLE h = get_handle ();
if (h)
return fstatvfs_by_handle (h, sfs);
}
fhandler_disk_file fh (pc); fhandler_disk_file fh (pc);
fh.get_device () = FH_FS; fh.get_device () = FH_FS;
return fh.fstatvfs (sfs); return fh.fstatvfs (sfs);