From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <corinna@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2155)
 id 0C81E385040E; Mon,  1 Feb 2021 10:01:23 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0C81E385040E
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: pty: Make slave read() thread-safe.
X-Act-Checkin: newlib-cygwin
X-Git-Author: Takashi Yano via Cygwin-patches <cygwin-patches@cygwin.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 0b64cc6812e054dbc09cc1ee82b6582d4b5205e8
X-Git-Newrev: f186f61d60b342c8167e652073bdc6e3f704a90a
Message-Id: <20210201100123.0C81E385040E@sourceware.org>
Date: Mon,  1 Feb 2021 10:01:23 +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: Mon, 01 Feb 2021 10:01:23 -0000

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

commit f186f61d60b342c8167e652073bdc6e3f704a90a
Author: Takashi Yano via Cygwin-patches <cygwin-patches@cygwin.com>
Date:   Thu Jan 28 23:11:33 2021 +0900

    Cygwin: pty: Make slave read() thread-safe.
    
    - Currently slave read() is somehow not thread-safe. This patch
      fixes the issue.

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

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 06fc19ac2..48b89ae77 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1241,6 +1241,7 @@ fhandler_pty_slave::read (void *ptr, size_t& len)
 	time_to_wait = !vtime ? INFINITE : 100 * vtime;
     }
 
+wait_retry:
   while (len)
     {
       switch (cygwait (input_available_event, time_to_wait))
@@ -1319,6 +1320,11 @@ fhandler_pty_slave::read (void *ptr, size_t& len)
 	    }
 	  goto out;
 	}
+      if (!IsEventSignalled (input_available_event))
+	{ /* Maybe another thread has processed input. */
+	  ReleaseMutex (input_mutex);
+	  goto wait_retry;
+	}
 
       if (!bytes_available (bytes_in_pipe))
 	{