libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-01-19 04:49:25 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: fix facl on sockets that are not socket files

Browse Source 
If facl(2) is called on an AF_LOCAL or AF_UNIX socket that is not a
socket file, the current code calls fhandler_disk_file::facl 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::facl only if the
fhandler_socket object is a file (determined by testing dev().isfs()).
This commit is contained in:
Ken Brown 2021-02-22 10:13:09 -05:00
parent cb0e71d3f8
commit 012427c96e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/fhandler_socket_local.cc
View File

@ -737,8 +737,12 @@ fhandler_socket_local::fchown (uid_t uid, gid_t gid)
int
fhandler_socket_local::facl (int cmd, int nentries, aclent_t *aclbufp)
{
if (get_sun_path () && get_sun_path ()[0] == '\0')
if (!dev ().isfs ())
/* facl called on a socket. */
return fhandler_socket_wsock::facl (cmd, nentries, aclbufp);
/* facl on a socket file. [We won't get here if facl is called on a
socket opened w/ O_PATH.] */
fhandler_disk_file fh (pc);
return fh.facl (cmd, nentries, aclbufp);
}

8
winsup/cygwin/fhandler_socket_unix.cc
View File

@ -2408,10 +2408,12 @@ fhandler_socket_unix::fchown (uid_t uid, gid_t gid)
int
fhandler_socket_unix::facl (int cmd, int nentries, aclent_t *aclbufp)
{
if (sun_path ()
&& (sun_path ()->un_len <= (socklen_t) sizeof (sa_family_t)
|| sun_path ()->un.sun_path[0] == '\0'))
if (!dev ().isfs ())
/* facl called on a socket. */
return fhandler_socket::facl (cmd, nentries, aclbufp);
/* facl on a socket file. [We won't get here if facl is called on a
socket opened w/ O_PATH.] */
fhandler_disk_file fh (pc);
return fh.facl (cmd, nentries, aclbufp);
}