From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 0FEDA385781F; Tue, 14 Sep 2021 15:08:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0FEDA385781F Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: pipe, fifo: Call set_no_inheritance() for adjunct handles. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/master X-Git-Oldrev: 3e80b12fde6126d85ae2ee58ba57e499c57b6c92 X-Git-Newrev: 0d12015670a00b7ecb2db4f66368e863b68de13d Message-Id: <20210914150805.0FEDA385781F@sourceware.org> Date: Tue, 14 Sep 2021 15:08:05 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2021 15:08:05 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=0d12015670a00b7ecb2db4f66368e863b68de13d commit 0d12015670a00b7ecb2db4f66368e863b68de13d Author: Takashi Yano Date: Tue Sep 14 12:49:35 2021 +0900 Cygwin: pipe, fifo: Call set_no_inheritance() for adjunct handles. - Currntly, set_no_inheritance() is not called for the adjunct handles such as select_sem. This patch fixes the issue. Diff: --- winsup/cygwin/fhandler.h | 1 + winsup/cygwin/fhandler_fifo.cc | 2 ++ winsup/cygwin/fhandler_pipe.cc | 10 ++++++++++ 3 files changed, 13 insertions(+) diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 13fba9a14..46381c397 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -1208,6 +1208,7 @@ public: void open_setup (int flags); void fixup_after_fork (HANDLE); int dup (fhandler_base *child, int); + void set_close_on_exec (bool val); int close (); void __reg3 raw_read (void *ptr, size_t& len); int ioctl (unsigned int cmd, void *); diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc index aa89fa7ae..37498f547 100644 --- a/winsup/cygwin/fhandler_fifo.cc +++ b/winsup/cygwin/fhandler_fifo.cc @@ -1817,4 +1817,6 @@ fhandler_fifo::set_close_on_exec (bool val) set_no_inheritance (fc_handler[i].h, val); fifo_client_unlock (); } + if (select_sem) + set_no_inheritance (select_sem, val); } diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler_pipe.cc index 70cfa3784..da473a1dc 100644 --- a/winsup/cygwin/fhandler_pipe.cc +++ b/winsup/cygwin/fhandler_pipe.cc @@ -515,6 +515,16 @@ fhandler_pipe_fifo::raw_write (const void *ptr, size_t len) return nbytes ?: -1; } +void +fhandler_pipe::set_close_on_exec (bool val) +{ + fhandler_base::set_close_on_exec (val); + if (read_mtx) + set_no_inheritance (read_mtx, val); + if (select_sem) + set_no_inheritance (select_sem, val); +} + void fhandler_pipe::fixup_after_fork (HANDLE parent) {