From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <corinna@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2155)
 id EAEFE3858403; Wed, 15 Sep 2021 13:42:27 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EAEFE3858403
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: pipes: don't call NtQueryInformationFile on
 read side of pipes
X-Act-Checkin: newlib-cygwin
X-Git-Author: Corinna Vinschen <corinna@vinschen.de>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: f961a63ed670788074c688c0cdaab3b5146b6b61
X-Git-Newrev: 34b14470406cb9551f98707bf63175811a506523
Message-Id: <20210915134227.EAEFE3858403@sourceware.org>
Date: Wed, 15 Sep 2021 13:42:27 +0000 (GMT)
X-BeenThere: cygwin-cvs@cygwin.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Cygwin core component git logs <cygwin-cvs.cygwin.com>
List-Unsubscribe: <https://cygwin.com/mailman/options/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=unsubscribe>
List-Archive: <https://cygwin.com/pipermail/cygwin-cvs/>
List-Help: <mailto:cygwin-cvs-request@cygwin.com?subject=help>
List-Subscribe: <https://cygwin.com/mailman/listinfo/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=subscribe>
X-List-Received-Date: Wed, 15 Sep 2021 13:42:28 -0000

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

commit 34b14470406cb9551f98707bf63175811a506523
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Wed Sep 15 14:17:59 2021 +0200

    Cygwin: pipes: don't call NtQueryInformationFile on read side of pipes
    
    NtQueryInformationFile hangs if it's called on the read side handle of
    a pipe while another thread or process is performing a blocking read.
    
    Avoid select potentially hanging by calling NtQueryInformationFile
    only on the write side of the pipe and using PeekNamedPipe otherwise.
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/select.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index a09d8a34d..566cf66d6 100644
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -587,6 +587,14 @@ no_verify (select_record *, fd_set *, fd_set *, fd_set *)
 static int
 pipe_data_available (int fd, fhandler_base *fh, HANDLE h, bool writing)
 {
+  if (fh->get_device () == FH_PIPER)
+    {
+      DWORD nbytes_in_pipe;
+      if (!writing && PeekNamedPipe (h, NULL, 0, NULL, &nbytes_in_pipe, NULL))
+	return nbytes_in_pipe > 0;
+      return -1;
+    }
+
   IO_STATUS_BLOCK iosb = {{0}, 0};
   FILE_PIPE_LOCAL_INFORMATION fpli = {0};
   NTSTATUS status;