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

Cygwin: fix fchmod on sockets that are not socket files

Browse Source 
If fchmod(2) is called on an AF_LOCAL or AF_UNIX socket that is not a
socket file, the current code calls fhandler_disk_file::fchmod 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::fchmod only if the
fhandler_socket object is a file (determined by testing dev().isfs()).
This commit is contained in:
Ken Brown 2021-02-22 09:34:36 -05:00
parent 8889d21010
commit 1a9ceab5dd
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

@ -710,8 +710,12 @@ fhandler_socket_local::fstatvfs (struct statvfs *sfs)
int
fhandler_socket_local::fchmod (mode_t newmode)
{
if (get_sun_path () && get_sun_path ()[0] == '\0')
if (!dev ().isfs ())
/* fchmod called on a socket. */
return fhandler_socket_wsock::fchmod (newmode);
/* chmod on a socket file. [We won't get here if fchmod is called
on a socket opened w/ O_PATH.] */
fhandler_disk_file fh (pc);
fh.get_device () = FH_FS;
return fh.fchmod (S_IFSOCK | adjust_socket_file_mode (newmode));

8
winsup/cygwin/fhandler_socket_unix.cc
View File

@ -2374,10 +2374,12 @@ fhandler_socket_unix::fstatvfs (struct statvfs *sfs)
int
fhandler_socket_unix::fchmod (mode_t newmode)
{
if (sun_path ()
&& (sun_path ()->un_len <= (socklen_t) sizeof (sa_family_t)
|| sun_path ()->un.sun_path[0] == '\0'))
if (!dev ().isfs ())
/* fchmod called on a socket. */
return fhandler_socket::fchmod (newmode);
/* chmod on a socket file. [We won't get here if fchmod is called
on a socket opened w/ O_PATH.] */
fhandler_disk_file fh (pc);
fh.get_device () = FH_FS;
/* Kludge: Don't allow to remove read bit on socket files for