From patchwork Sat Dec 13 08:53:34 2025
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Andrew Burgess <aburgess@redhat.com>
X-Patchwork-Id: 126501
Return-Path: <gdb-patches-bounces~patchwork=sourceware.org@sourceware.org>
X-Original-To: patchwork@sourceware.org
Delivered-To: patchwork@sourceware.org
Received: from vm01.sourceware.org (localhost [127.0.0.1])
	by sourceware.org (Postfix) with ESMTP id BAF2E4BA2E22
	for <patchwork@sourceware.org>; Sat, 13 Dec 2025 08:55:03 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BAF2E4BA2E22
Authentication-Results: sourceware.org;
	dkim=fail reason="signature verification failed" (1024-bit key,
 unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256
 header.s=mimecast20190719 header.b=cT9gy9dX
X-Original-To: gdb-patches@sourceware.org
Delivered-To: gdb-patches@sourceware.org
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124])
 by sourceware.org (Postfix) with ESMTP id 167FE4BA2E1D
 for <gdb-patches@sourceware.org>; Sat, 13 Dec 2025 08:53:46 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 167FE4BA2E1D
Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none)
 header.from=redhat.com
Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com
ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 167FE4BA2E1D
Authentication-Results: server2.sourceware.org;
 arc=none smtp.remote-ip=170.10.129.124
ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1765616026; cv=none;
 b=Wb8yzzy6Utnxs/K6l+7Z4oMOYmimFWqFcCZE8QZZJfKhqZ9jUa1WbrPw1PnhJeHgWQGkS3aA1pXxHaAhsWsHdADrLKF25Ewo3YcsW0urhdC1zEh+p51GMPv8ahKdm69Yj+ZeYURCk3HS79i9iC3Ry2I/pqQus4o38r6aHiDQ+GI=
ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key;
 t=1765616026; c=relaxed/simple;
 bh=XL1cFPX+b5egK5Q+oVPwlCInX+EJmQq6Pj9HFPZliEw=;
 h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version;
 b=LPBqVfq/ru0z2lw/dFCIIjPN3SHmrGYv5GYZJ0FwkpcefJjjFL1SuhJTcOciX8vlY1cOLw5uKErrWtAij0LU9cASnL2C0zTFDZf0jlgk28nuqhoKg5zbXFxsuvYeyVpecCp+Mqx/y+9m7YxQhpKHgBB6Qm4OgiMawhGu2JOwq/Y=
ARC-Authentication-Results: i=1; server2.sourceware.org
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 167FE4BA2E1D
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
 s=mimecast20190719; t=1765616025;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=y6B2LWMl5/HDOW8BYlwbbs0JXGPHb3pyw63XRZOkQ0w=;
 b=cT9gy9dXJ4Y8ahbpCD7IwYGpBN49a/R2AQid/MlT8eJjOgONavvpmGb0HNfxTo5433MV+Q
 3TFeg+j8UpPpUGBGP4ajpjr3igN1HEnDnM0PGT4r/N2agv3bEcGY/ZdYfnMFQj0Z6EwoIY
 IdmFA/0/bobbNPWTnCRque/xVvhJKw8=
Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com
 [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id
 us-mta-447-bzoBOAExNpamXeo1gd81pw-1; Sat, 13 Dec 2025 03:53:44 -0500
X-MC-Unique: bzoBOAExNpamXeo1gd81pw-1
X-Mimecast-MFC-AGG-ID: bzoBOAExNpamXeo1gd81pw_1765616023
Received: by mail-wm1-f71.google.com with SMTP id
 5b1f17b1804b1-4779b3749a8so14720055e9.1
 for <gdb-patches@sourceware.org>; Sat, 13 Dec 2025 00:53:44 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1765616023; x=1766220823;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from
 :to:cc:subject:date:message-id:reply-to;
 bh=5fZxgExDU9Vw9QGlSlN1VetYhf+17NjpQ4ARnGSmle0=;
 b=S6WIBuwHqNZuRPoz+4JKtZErHVYL455eojlDPDFF3PiqOV23Ma6jC+EfNCQTSC46pR
 vYTzC+0oBGxQfgN4G3WThy0ng7qCj6cTtNnnD3Sb/ad/jQsiq31UnIDZbTFAdgyVzXU4
 SAoDirTOREA/9RgODkjZnrBf0CttYVFwYZ++HN5kT+7d5pIitoQH2555cHNQ/4UOv0K9
 5qvjFmf9W42U4ZmCBVstMGeAcH246Bx/PhWhHo9VsMDJ3TPbQlgVZB2VWA2EFKb7DUO6
 oPajmuJitSLJmgtSgWG1vmHnWRbzc637E+RAR/EzSqTfTlaGwBukXFgI4pbeOO9EbKtk
 Yf4Q==
X-Gm-Message-State: AOJu0YzeBEefOfX5WHCO4rfqfWHa6RFb79L8OsQLhutNc1AmGYwEejDE
 WTlg1bnLGzAk1OT46VR023/Y1bAgqFwqrxJ557/9DZeJ2XhKWFR1LWePVXm4GyAemXFfffTh82Z
 YVnHiH2SnTGuxxZHHZiXqn8RKSZiPWHdLmg3UOHqV8e6cb0IuEGnr6hYkM2WU431OGOq+nmUZIx
 a9x8qrRSimk6ZrDkMaWXAaXCPTazyh4TKeJ6iR8CsfNcrWbnM=
X-Gm-Gg: AY/fxX5v6POwQhutu6CfBiaJSsZDCX32vnSclIjmH2orhGljgybnJbdKOm8s5JMaGsT
 YTWQs0GPrZ2wfF/pVSpi0dEh6x6pxHDNKm0vFhvtOS9O/DuAd1ZHWAz9H0wvDpXN8aecV0oqSn7
 XNu6sXuvhfQOE/ad6jfySYVfKJGdcERg5KUMykztfy6htfLR5Rwp9nMXK+UW4cwJfzwWZi/9sgs
 7eSowYwtP77qB3yXjhto3UCoNyqYJpAOqxnXGwkyMK0FXsJfERFdbAdramAMVdpBhMNfn7znEkP
 nxGG/KDIITzvoCKFuKuZH8vr1wAKkDeTS7RoWGj9jQ4vtBbvNK6fCHUESgzYjNTUsT4k+YUe7BJ
 xw1Uq
X-Received: by 2002:a05:600c:a086:b0:471:1774:3003 with SMTP id
 5b1f17b1804b1-47a8f90fefamr50034015e9.29.1765616022753;
 Sat, 13 Dec 2025 00:53:42 -0800 (PST)
X-Google-Smtp-Source: 
 AGHT+IF+MyTrP1Xcl5IAS4WOec4XYXqR378d+uS/0mohiuctvDLhlNPViKSsV2dp7r+UVLIiLT3XEA==
X-Received: by 2002:a05:600c:a086:b0:471:1774:3003 with SMTP id
 5b1f17b1804b1-47a8f90fefamr50033805e9.29.1765616022305;
 Sat, 13 Dec 2025 00:53:42 -0800 (PST)
Received: from localhost ([31.111.84.207]) by smtp.gmail.com with ESMTPSA id
 5b1f17b1804b1-47a8f4a3e9fsm74489275e9.6.2025.12.13.00.53.41
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sat, 13 Dec 2025 00:53:41 -0800 (PST)
From: Andrew Burgess <aburgess@redhat.com>
To: gdb-patches@sourceware.org
Cc: Andrew Burgess <aburgess@redhat.com>
Subject: [PATCHv2 GDB 17 2/2] gdb: fix crash from 'shell' when GDB has no
 terminal
Date: Sat, 13 Dec 2025 08:53:34 +0000
Message-ID: 
 <fcf378fed2f225819f4d6b22db6e5c968267d60e.1765615940.git.aburgess@redhat.com>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <cover.1765615940.git.aburgess@redhat.com>
References: 
 <562d1cc3615faad72139c6974a4e76b292285f77.1765556713.git.aburgess@redhat.com>
 <cover.1765615940.git.aburgess@redhat.com>
MIME-Version: 1.0
X-Mimecast-Spam-Score: 0
X-Mimecast-MFC-PROC-ID: 6lzzTwrRER9hPnPMOy3hSeB0vlo_wR0VAZhAhnOosBc_1765616023
X-Mimecast-Originator: redhat.com
content-type: text/plain; charset="US-ASCII"; x-default=true
X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, DKIM_INVALID,
 DKIM_SIGNED, GIT_PATCH_0, KAM_DMARC_QUARANTINE, KAM_DMARC_STATUS, KAM_SHORT,
 RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_RPBL_BLOCKED,
 RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_NONE, TXREP,
 URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org
X-BeenThere: gdb-patches@sourceware.org
X-Mailman-Version: 2.1.30
Precedence: list
List-Id: Gdb-patches mailing list <gdb-patches.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/gdb-patches>,
 <mailto:gdb-patches-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/gdb-patches>,
 <mailto:gdb-patches-request@sourceware.org?subject=subscribe>
Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org

Bug PR gdb/33716 identifies a problem where GDB will crash when using
the 'shell' command if GDB is not attached to a terminal.  E.g.:

  $ gdb -nw -nh -q -batch -ex 'shell echo hello' </dev/null
  hello

  Fatal signal: Segmentation fault
  ----- Backtrace -----
  ... etc ...

This problem was introduced with commit:

  commit 3a7f7d0be3a2953fd110f084b34586ce9c649d66
  Date:   Fri Jul 25 19:07:59 2025 +0200

      [gdb/tui] Fix shell command terminal settings

This commit introduces 'class scoped_gdb_ttystate', a RAII class which
backs up and restores the current terminal state.  Unfortunately, the
implementation tries to backup and restore the state even when GDB is
not attached to a terminal.

If GDB is not attached to a terminal then serial_get_tty_state
will (on a Unix like system) return a NULL pointer.  Calling
serial_set_tty_state with a NULL state object will trigger the crash
seen above.

Elsewhere in GDB, calling serial_set_tty_state is guarded by calling
gdb_has_a_terminal().  I propose that we only try to backup the
terminal state if GDB is actually connected to a terminal.  The call
to serial_set_tty_state will only be made if the backed up tty state
is not NULL.

With this change in place the crash is resolved.  There's a new test
to cover this case.

While I'm here I added a gdb_assert in ser-unix.c which would have
triggered in this case before we saw the crash.  And I've extended the
comment in serial.h to document that serial_get_tty_state can return
NULL.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=33716
---
 gdb/inflow.c                                 |  8 ++-
 gdb/ser-unix.c                               |  1 +
 gdb/serial.h                                 |  3 +-
 gdb/terminal.h                               |  4 +-
 gdb/testsuite/gdb.base/shell-no-terminal.exp | 60 ++++++++++++++++++++
 5 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 gdb/testsuite/gdb.base/shell-no-terminal.exp

diff --git a/gdb/inflow.c b/gdb/inflow.c
index 518b2dcf4e0..0292192ae2e 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -49,6 +49,8 @@
 
 static void pass_signal (int);
 
+static int gdb_has_a_terminal (void);
+
 static void child_terminal_ours_1 (target_terminal_state);
 
 /* Record terminal status separately for debugger and inferior.  */
@@ -59,14 +61,16 @@ static struct serial *stdin_serial;
 
 scoped_restore_tty_state::scoped_restore_tty_state ()
 {
-  m_ttystate = serial_get_tty_state (stdin_serial);
+  if (gdb_has_a_terminal ())
+    m_ttystate = serial_get_tty_state (stdin_serial);
 }
 
 /* See terminal.h.  */
 
 scoped_restore_tty_state::~scoped_restore_tty_state ()
 {
-  serial_set_tty_state (stdin_serial, m_ttystate);
+  if (m_ttystate != nullptr)
+    serial_set_tty_state (stdin_serial, m_ttystate);
 }
 
 /* Terminal related info we need to keep track of.  Each inferior
diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index f9ef8441629..9d17e1cc3ad 100644
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -152,6 +152,7 @@ hardwire_set_tty_state (struct serial *scb, serial_ttystate ttystate)
   struct hardwire_ttystate *state;
 
   state = (struct hardwire_ttystate *) ttystate;
+  gdb_assert (state != nullptr);
 
   return set_tty_state (scb, state);
 }
diff --git a/gdb/serial.h b/gdb/serial.h
index 6bcb5ab6598..a7070dfc8bd 100644
--- a/gdb/serial.h
+++ b/gdb/serial.h
@@ -152,7 +152,8 @@ extern void serial_send_break (struct serial *scb);
 extern void serial_raw (struct serial *scb);
 
 /* Return a pointer to a newly malloc'd ttystate containing the state
-   of the tty.  */
+   of the tty.  Can return NULL if the current tty state could not be
+   read.  */
 
 extern serial_ttystate serial_get_tty_state (struct serial *scb);
 
diff --git a/gdb/terminal.h b/gdb/terminal.h
index 225554a60c3..892d43113d4 100644
--- a/gdb/terminal.h
+++ b/gdb/terminal.h
@@ -59,7 +59,9 @@ class scoped_restore_tty_state
   DISABLE_COPY_AND_ASSIGN (scoped_restore_tty_state);
 
 private:
-  serial_ttystate m_ttystate;
+  /* The saved tty state.  This can remain NULL even after the constructor
+     has run if serial_get_tty_state fails to fetch the tty state.  */
+  serial_ttystate m_ttystate = nullptr;
 };
 
 #ifdef USE_WIN32API
diff --git a/gdb/testsuite/gdb.base/shell-no-terminal.exp b/gdb/testsuite/gdb.base/shell-no-terminal.exp
new file mode 100644
index 00000000000..2a630fb1541
--- /dev/null
+++ b/gdb/testsuite/gdb.base/shell-no-terminal.exp
@@ -0,0 +1,60 @@
+# Copyright 2025 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Run GDB in batch mode, with stdin attached to a non-pty.  Use the
+# 'shell' command from the GDB command line.  Check that GDB doesn't
+# crash.  This checks for bug PR gdb/33716.
+
+# Remote boards override the 'remote_spawn' mechanism, and don't
+# support the 'readonly' argument that this test relies on.  Just
+# running this test on local hosts should be fine.
+require {!is_remote host}
+
+gdb_exit
+
+save_vars { GDBFLAGS } {
+    append GDBFLAGS " -batch -ex \"shell echo first\" -ex \"shell echo second\" </dev/null"
+
+    # Inlined default_gdb_spawn.
+    verbose -log "Spawning $GDB $INTERNAL_GDBFLAGS $GDBFLAGS"
+    gdb_write_cmd_file "$GDB $INTERNAL_GDBFLAGS $GDBFLAGS"
+
+    set use_gdb_stub [use_gdb_stub]
+    set res [remote_spawn host "$GDB $INTERNAL_GDBFLAGS [host_info gdb_opts] $GDBFLAGS" "readonly"]
+    if { $res < 0 || $res == "" } {
+	perror "Spawning $GDB failed."
+	return
+    }
+    set gdb_spawn_id $res
+}
+
+# Capture the output of the GDB process.  The above GDB is spawned
+# without a pty (so that we can replace its stdin), and so we don't
+# use '\r\n' as the end of line sequence, instead we expect '\n'.
+set saw_first false
+set saw_second false
+gdb_test_multiple "" "check shell command output" {
+    -re "^first\n" {
+	set saw_first true
+	exp_continue
+    }
+    -re "^second\n" {
+	set saw_second true
+	exp_continue
+    }
+    eof {
+	gdb_assert { $saw_first && $saw_second } $gdb_test_name
+    }
+}