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

Cygwin: path_conv: add PATH_RESOLVE_PROCFD path_types flag 

path_conv now sets the PATH_RESOLVE_PROCFD flag in path_flags if
the PC_SYM_NOFOLLOW_PROCFD pathconv_arg flag has been set on input
*and* the file is actually a proc fd symlink.

Add matching path_conv::follow_fd_symlink method for checking and
use it in open(2).

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2019-01-06 20:13:52 +01:00
parent c1023ee353
commit ba12614f79
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/path.cc
View File

@ -850,7 +850,10 @@ path_conv::check (const char *src, unsigned opt,
case virt_fdsymlink: case virt_fdsymlink:
/* Allow open/linkat to do the right thing. */ /* Allow open/linkat to do the right thing. */
if (opt & PC_SYM_NOFOLLOW_PROCFD) if (opt & PC_SYM_NOFOLLOW_PROCFD)
opt &= ~PC_SYM_FOLLOW; {
opt &= ~PC_SYM_FOLLOW;
sym.path_flags |= PATH_RESOLVE_PROCFD;
}
/*FALLTHRU*/ /*FALLTHRU*/
case virt_symlink: case virt_symlink:
goto is_virtual_symlink; goto is_virtual_symlink;

2
winsup/cygwin/path.h
View File

@ -69,6 +69,7 @@ enum path_types
PATH_REP = _BIT ( 3), PATH_REP = _BIT ( 3),
PATH_SYMLINK = _BIT ( 4), PATH_SYMLINK = _BIT ( 4),
PATH_SOCKET = _BIT ( 5), PATH_SOCKET = _BIT ( 5),
PATH_RESOLVE_PROCFD = _BIT ( 6),
PATH_DONT_USE = _BIT (31) /* conversion to signed happens. */ PATH_DONT_USE = _BIT (31) /* conversion to signed happens. */
}; };
@ -192,6 +193,7 @@ class path_conv
int iscygexec () const {return mount_flags & MOUNT_CYGWIN_EXEC;} int iscygexec () const {return mount_flags & MOUNT_CYGWIN_EXEC;}
int isopen () const {return path_flags & PATH_OPEN;} int isopen () const {return path_flags & PATH_OPEN;}
int isctty_capable () const {return path_flags & PATH_CTTY;} int isctty_capable () const {return path_flags & PATH_CTTY;}
int follow_fd_symlink () const {return path_flags & PATH_RESOLVE_PROCFD;}
void set_cygexec (bool isset) void set_cygexec (bool isset)
{ {
if (isset) if (isset)

8
winsup/cygwin/syscalls.cc
View File

@ -1398,13 +1398,13 @@ open (const char *unix_path, int flags, ...)
if (fd < 0) if (fd < 0)
__leave; /* errno already set */ __leave; /* errno already set */
int opt = PC_OPEN | PC_SYM_NOFOLLOW_PROCFD;
opt |= (flags & (O_NOFOLLOW | O_EXCL)) ? PC_SYM_NOFOLLOW
: PC_SYM_FOLLOW;
/* This is a temporary kludge until all utilities can catch up /* This is a temporary kludge until all utilities can catch up
with a change in behavior that implements linux functionality: with a change in behavior that implements linux functionality:
opening a tty should not automatically cause it to become the opening a tty should not automatically cause it to become the
controlling tty for the process. */ controlling tty for the process. */
int opt = PC_OPEN | PC_SYM_NOFOLLOW_PROCFD;
opt |= (flags & (O_NOFOLLOW | O_EXCL)) ? PC_SYM_NOFOLLOW
: PC_SYM_FOLLOW;
if (!(flags & O_NOCTTY) && fd > 2 && myself->ctty != -2) if (!(flags & O_NOCTTY) && fd > 2 && myself->ctty != -2)
{ {
flags |= O_NOCTTY; flags |= O_NOCTTY;
@ -1472,7 +1472,7 @@ open (const char *unix_path, int flags, ...)
fh = fh_file; fh = fh_file;
} }
if (fh->dev () == FH_PROCESSFD) if (fh->dev () == FH_PROCESSFD && fh->pc.follow_fd_symlink ())
{ {
/* Reopen file by descriptor */ /* Reopen file by descriptor */
fh_file = fh->fd_reopen (flags); fh_file = fh->fd_reopen (flags);