diff options
| author | Ken Brown <kbrown@cornell.edu> | 2020-09-08 11:45:09 -0400 |
|---|---|---|
| committer | Ken Brown <kbrown@cornell.edu> | 2020-09-08 14:58:18 -0400 |
| commit | 58cc67d6536c73c463114a30b4f14f331137baeb (patch) | |
| tree | 560c89ff3d59acc324ba53e54a043d5e338c60e4 | |
| parent | eaed594d736259c42affa7cf58f12492cbc5fb67 (diff) | |
| download | cygnal-58cc67d6536c73c463114a30b4f14f331137baeb.tar.gz cygnal-58cc67d6536c73c463114a30b4f14f331137baeb.tar.bz2 cygnal-58cc67d6536c73c463114a30b4f14f331137baeb.zip | |
Cygwin: format_process_fd: add directory check
The incoming path is allowed to have the form "$PID/fd/[0-9]*/.*"
provided the descriptor symlink points to a directory. Check that
this is indeed the case.
| -rw-r--r-- | winsup/cygwin/fhandler_process.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc index a6c358217..888604e3d 100644 --- a/winsup/cygwin/fhandler_process.cc +++ b/winsup/cygwin/fhandler_process.cc @@ -398,6 +398,21 @@ format_process_fd (void *data, char *&destbuf) *((process_fd_t *) data)->fd_type = virt_fdsymlink; else /* trailing path */ { + /* Does the descriptor link point to a directory? */ + bool dir; + if (*destbuf != '/') /* e.g., "pipe:[" or "socket:[" */ + dir = false; + else + { + path_conv pc (destbuf); + dir = pc.isdir (); + } + if (!dir) + { + set_errno (ENOTDIR); + cfree (destbuf); + return -1; + } char *newbuf = (char *) cmalloc_abort (HEAP_STR, strlen (destbuf) + strlen (e) + 1); stpcpy (stpcpy (newbuf, destbuf), e); |