[newlib-cygwin] Cygwin: make callers of open_setup check for failure

Ken Brown kbrown@sourceware.org
Mon Sep 20 19:10:39 GMT 2021


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=be08c5c40b9224038ff5af9a033662752ce18ba7

commit be08c5c40b9224038ff5af9a033662752ce18ba7
Author: Ken Brown <kbrown@cornell.edu>
Date:   Sat Sep 18 09:10:23 2021 -0400

    Cygwin: make callers of open_setup check for failure
    
    open_setup is called by dtable::init_std_file_from_handle and
    fhandler_base::open_with_arch.  In both cases, failure of open_setup
    is now a fatal error.
    
    Currently this can only happen in the following situation: A Cygwin
    process is started by a non-Cygwin process, one of the standard IO
    handles is a pipe handle, and Cygwin is unable to create a required
    mutex (read_mtx or hdl_cnt_mtx).

Diff:
---
 winsup/cygwin/dtable.cc   | 3 ++-
 winsup/cygwin/fhandler.cc | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
index a638a5995..d57cbb355 100644
--- a/winsup/cygwin/dtable.cc
+++ b/winsup/cygwin/dtable.cc
@@ -412,7 +412,8 @@ dtable::init_std_file_from_handle (int fd, HANDLE handle)
 	  fhp->set_pipe_buf_size ();
 	}
 
-      fh->open_setup (openflags);
+      if (!fh->open_setup (openflags))
+	api_fatal ("open_setup failed, %E");
       fh->usecount = 0;
       cygheap->fdtab[fd] = fh;
       cygheap->fdtab[fd]->inc_refcnt ();
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index 1af469e0c..36862c712 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -471,7 +471,8 @@ fhandler_base::open_with_arch (int flags, mode_t mode)
 	  archetype_usecount (1);
 	  usecount = 0;
 	}
-      open_setup (flags);
+      if (!open_setup (flags))
+	api_fatal ("open_setup failed, %E");
     }
 
   close_on_exec (flags & O_CLOEXEC);


More information about the Cygwin-cvs mailing list