From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <corinna@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2155)
 id 2BFB1385041C; Wed,  9 Sep 2020 21:44:54 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2BFB1385041C
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: setup new pty on opening the master,
 not in constructor
X-Act-Checkin: newlib-cygwin
X-Git-Author: Corinna Vinschen <corinna@vinschen.de>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: fd3ad92f9ee1e6f58ffe3597fbd5bba3c778677d
X-Git-Newrev: 09738c30627c20770d2a1cfa33aaf233bb77d035
Message-Id: <20200909214454.2BFB1385041C@sourceware.org>
Date: Wed,  9 Sep 2020 21:44:54 +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, 09 Sep 2020 21:44:54 -0000

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

commit 09738c30627c20770d2a1cfa33aaf233bb77d035
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Wed Sep 9 22:50:11 2020 +0200

    Cygwin: pty: setup new pty on opening the master, not in constructor
    
    Setting up the pty in the master constructor ends up creating a new pty
    on every stat(2) call on /dev/ptmx.  Only do this when actually opening
    the device, not when using the device class in another, non-opening
    context.
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/fhandler_tty.cc | 7 ++-----
 winsup/cygwin/release/3.2.0   | 3 +++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 16d4a99f4..37d033bbe 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -1470,17 +1470,14 @@ fhandler_pty_master::fhandler_pty_master (int unit)
 {
   if (unit >= 0)
     dev ().parse (DEV_PTYM_MAJOR, unit);
-  else if (!setup ())
-    {
-      dev ().parse (FH_ERROR);
-      return;
-    }
   set_name ("/dev/ptmx");
 }
 
 int
 fhandler_pty_master::open (int flags, mode_t)
 {
+  if (!setup ())
+      return 0;
   set_open_status ();
   dwProcessId = GetCurrentProcessId ();
   return 1;
diff --git a/winsup/cygwin/release/3.2.0 b/winsup/cygwin/release/3.2.0
index 57d6d5147..11de87dbc 100644
--- a/winsup/cygwin/release/3.2.0
+++ b/winsup/cygwin/release/3.2.0
@@ -36,3 +36,6 @@ Bug Fixes
 
 - Fix assertion failure on an invalid path under /proc/<pid>/fd/.
   Addresses: https://cygwin.com/pipermail/cygwin/2020-September/246160.html
+
+- Fix crash on stat(2)'ing /dev/ptmx on 32 bit
+  Addresses: https://cygwin.com/pipermail/cygwin/2020-September/246218.html