From patchwork Thu Apr 2 08:49:14 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 132615 Return-Path: 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 A9EB34BA2E32 for ; Thu, 2 Apr 2026 08:49:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A9EB34BA2E32 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=x2ALeHko; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=XNjtby37; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=0Whf7bfR; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=R0g+wXVy X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 72E434BA2E2B for ; Thu, 2 Apr 2026 08:49:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 72E434BA2E2B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 72E434BA2E2B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1775119759; cv=none; b=Z1vAI9QBKFCX0nKDvfJeTtCj9Y8gW4OjiGlEPjuQmhosS4A99bAEJfZaU/TPZSuDvr0/I0/5wkzEnZ6DUlCTNs5nPSxDmClOlap1rgtPzZ6AigSIqymhSPkwguAN9P5ufAmI70QR5+P2sWyZsaXHFtJ4QrireH2zH+UNCPGOokg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1775119759; c=relaxed/simple; bh=ZSxjts/0uJ+hUibaWEMvCO8u27J7OPjtKPTwOsu9/GQ=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=qeLPCXRkzeA5DKI2by58AcRXyOkdDqMBgcgAra2eJLjlbR7E/ujDzbF/bRIhu0dCJFCszDZmtDHx0NhP/YZG/v4ochlFG8563INjY6JC5m6KZ72BzuZDEZs78axO5dSMaaWD7UpmMVykEkfW4aoLcrOWaic/UlJo9SThTqySTUI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 72E434BA2E2B Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 843695BD36 for ; Thu, 2 Apr 2026 08:49:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1775119756; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=knnI4gGC//Aj0Olw3HbOG90SpWHwoNjj1aFgnpxzSfI=; b=x2ALeHkoePVYCmGel408Br6Z7pwFuCxtpU/dSgqs2BP+2ZahvaGRXUCw3VDNt5GdWAmfs1 NkOXmPsVc0Qh3S4z7Kd8+9Vs1Y9CXsVeara9DgVPhqObvlSgkJwXFUJdKh/364V6a4pGdK uNJwhE/O9qrxqieyz2LedD9k35r668k= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1775119756; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=knnI4gGC//Aj0Olw3HbOG90SpWHwoNjj1aFgnpxzSfI=; b=XNjtby37wd+uMIDurvO98wErhihKhdQE/jReIvhZwnReugiuDdxXysvbe+8+lZLvUmSgBu HXyPsSiYJLisH9DA== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1775119755; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=knnI4gGC//Aj0Olw3HbOG90SpWHwoNjj1aFgnpxzSfI=; b=0Whf7bfRsfzOIJU8EJaqbrHeauJJPMshwsmcyVw2tK2+HLPNhazN1Z7v25vvnzgmTm6S7S 9lSy1oKMjhzNpcWP+gLTKMORfYzK7/po3gni3l+pWvv9+5/VIdrRm8NP+R/rT8jLuGKu5p tES3ntExyBwN0vVG3q2sQ4f102N/yIw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1775119755; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=knnI4gGC//Aj0Olw3HbOG90SpWHwoNjj1aFgnpxzSfI=; b=R0g+wXVyu6B1NLY/Rh4ka/OA2b3kB1XBvxEKAifJuFQGg5tibIxerkGcZ1gmIrTu3BBYol xSug+FSBmbHtrtDA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 676B64A0B0 for ; Thu, 2 Apr 2026 08:49:15 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id uhXFF4stzmmnPgAAD6G6ig (envelope-from ) for ; Thu, 02 Apr 2026 08:49:15 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2] [gdb] Fix segfault in sig_write Date: Thu, 2 Apr 2026 10:49:14 +0200 Message-ID: <20260402084914.946223-1-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 X-Spam-Score: -2.80 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[sourceware.org:url, imap1.dmz-prg2.suse.org:helo, suse.de:mid] X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org I ran into a segfault in sig_write: ... if (gdb_stderr == nullptr || gdb_stderr->fd () == -1) ... [ A regression since commit 817003ed469 ("Rewrite output redirection and logging"). ] This happens as follows. First, we get gdb_stderr by calling current_gdb_stderr, which returns current_ui.current_interpreter.m_stderr.get (), which is not nullptr. Then we do "gdb_stderr->fd ()", which gets us to wrapped_file >::fd: ... int fd () const override { return m_stream->fd (); } ... The "m_stream->" part brings us to: ... /* A "smart pointer" that references a particular member of the current UI. */ template struct ui_file_ptr { ui_file *operator-> () const { return current_ui->*F; } }; ... which does "current_ui.m_ui_stderr" which indeed is nullptr. Fix this in wrapped_file::fd by checking for a nullptr m_stream. A v1 was submitted here [1]. Changes in v2: - changed approach of fixing this: rather than trying to fix this in sig_write by avoiding the use of gdb_stderr, fix this in wrapped_file::fd. - added unit test Tested on x86_64-linux. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=33918 [1] v1: https://sourceware.org/pipermail/gdb-patches/2026-February/225155.html --- gdb/ui-file.h | 2 +- gdb/ui.h | 4 ++++ gdb/unittests/ui-file-selftests.c | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) base-commit: 8ee110dee1942a20fd206c7107a027e9b04ba56e diff --git a/gdb/ui-file.h b/gdb/ui-file.h index 6a1d3964335..b7d3aebda9a 100644 --- a/gdb/ui-file.h +++ b/gdb/ui-file.h @@ -420,7 +420,7 @@ class wrapped_file : public ui_file { m_stream->emit_style_escape (style); } int fd () const override - { return m_stream->fd (); } + { return m_stream == nullptr ? -1 : m_stream->fd (); } void puts_unfiltered (const char *str) override { m_stream->puts_unfiltered (str); } diff --git a/gdb/ui.h b/gdb/ui.h index 891660896ef..ef977470302 100644 --- a/gdb/ui.h +++ b/gdb/ui.h @@ -163,6 +163,10 @@ struct ui { return current_ui->*F; } + bool operator== (nullptr_t p) const + { + return current_ui->*F == nullptr; + } }; /* A ui_file that simply forwards. */ diff --git a/gdb/unittests/ui-file-selftests.c b/gdb/unittests/ui-file-selftests.c index 69e48735001..b9c1aca3774 100644 --- a/gdb/unittests/ui-file-selftests.c +++ b/gdb/unittests/ui-file-selftests.c @@ -48,6 +48,20 @@ run_tests () scoped_restore save_7 = make_scoped_restore (&sevenbit_strings, true); check_one ("more weird stuff: \xa5", '\\', "more weird stuff: \\245"); + + { + /* There's a bug that has the effect "*redirectable_stderr () == nullptr". + In that case, gdb_stderr is not nullptr, but the underlying pointer is + a nullptr. Check that "gdb_stderr->fd ()" doesn't dereference the + underlying nullptr. + This allows us to check for a usable gdb_stderr using + "gdb_stderr != nullptr && gdb_stderr->fd () == -1", as we do in + sig_write. */ + scoped_restore restore_stderr + = make_scoped_restore (redirectable_stderr (), nullptr); + SELF_CHECK (gdb_stderr != nullptr); + SELF_CHECK (gdb_stderr->fd () == -1); + } } } /* namespace file*/