From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id kS0UGshdk2kSzT0AWB0awg (envelope-from ) for ; Mon, 16 Feb 2026 13:11:20 -0500 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=T4e6C17K; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=zPY+AWS8; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=T4e6C17K; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=zPY+AWS8; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 649461E0BA; Mon, 16 Feb 2026 13:11:20 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id AC28C1E08D for ; Mon, 16 Feb 2026 13:11:19 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 658D04BAD168 for ; Mon, 16 Feb 2026 18:11:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 658D04BAD168 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=T4e6C17K; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=zPY+AWS8; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=T4e6C17K; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=zPY+AWS8 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 1C5404BAE7CE for ; Mon, 16 Feb 2026 18:09:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1C5404BAE7CE 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 1C5404BAE7CE Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771265379; cv=none; b=oDnqujPw7Y+JSpbscvEi6OuA/FXIoHdNHS8xHAIX/QTvyqh60k7AxOyjKtXXxXRA3MlVIuz3pg/FL96IyA4/Mtpo2tZmLd6kpegnAi8AeFKfKYLVjiK84Rh9TJ5gnLQbWRnZeAJ0n7zamIPpggpUITxiy/176BOCnSlQ93gqqas= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771265379; c=relaxed/simple; bh=GJmSBVpBN2uxBvijDLySFUVO028PqtNFC+J1sjQUslU=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=qsgOBdf2lQ4aDTTfELuoI7REVX/mR0OpU+pVC+nSKiij+dhGbKVLklVI5X9YzFW4BOQUOU23j3sILhOWOKyGmGMiw3ijNm07Dq6DxidhpYV3J6YwII/3nBOpZpP5D8k/sxHAfQYPmxmNYRXcO6kOlNwMVfqcAXkCO7lxtL7JgcI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1C5404BAE7CE Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 999A75BDDC for ; Mon, 16 Feb 2026 18:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1771265371; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MjF/4v3Cii0idLXo4DF8PJp5xLD4eED7EeMMtw/Ka4k=; b=T4e6C17KXSdQopfsDgG3LJ07Y+bMbfB1R2OtxE8gpn4b+Sfji9XUmG9PV3FpJohy9ua+ui A7sCiC8SEWchKmk9IdyP5wXbNOww58XfnlRZoZwy8X8isC1Fem7ThOlrIgPmtW893jqBb6 CSFbMMf7IN7aE4MARw672D1mbI9bzTg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1771265371; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MjF/4v3Cii0idLXo4DF8PJp5xLD4eED7EeMMtw/Ka4k=; b=zPY+AWS8RdLCU90gBaDxoDa/OKAMo2SF1A6NQZFzHvR5dpd3BD0FHqPUZfSWuKI9e+DmPh sTElrfO2xprpMABQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=T4e6C17K; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=zPY+AWS8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1771265371; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MjF/4v3Cii0idLXo4DF8PJp5xLD4eED7EeMMtw/Ka4k=; b=T4e6C17KXSdQopfsDgG3LJ07Y+bMbfB1R2OtxE8gpn4b+Sfji9XUmG9PV3FpJohy9ua+ui A7sCiC8SEWchKmk9IdyP5wXbNOww58XfnlRZoZwy8X8isC1Fem7ThOlrIgPmtW893jqBb6 CSFbMMf7IN7aE4MARw672D1mbI9bzTg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1771265371; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MjF/4v3Cii0idLXo4DF8PJp5xLD4eED7EeMMtw/Ka4k=; b=zPY+AWS8RdLCU90gBaDxoDa/OKAMo2SF1A6NQZFzHvR5dpd3BD0FHqPUZfSWuKI9e+DmPh sTElrfO2xprpMABQ== 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 BBD5E3EA65 for ; Mon, 16 Feb 2026 18:09:29 +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 YMSlK1ldk2moCwAAD6G6ig (envelope-from ) for ; Mon, 16 Feb 2026 18:09:29 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 2/2] [gdb/symtab] Fix data race in try_open_dwop_file Date: Mon, 16 Feb 2026 19:09:25 +0100 Message-ID: <20260216180925.3174052-3-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260216180925.3174052-1-tdevries@suse.de> References: <20260216180925.3174052-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from,2a07:de40:b281:106:10:150:64:167:received]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns, suse.de:dkim, suse.de:mid] X-Rspamd-Queue-Id: 999A75BDDC X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.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~public-inbox=simark.ca@sourceware.org The call to bfd_check_format in try_open_dwop_file: ... /* The operations below are not thread-safe, use a lock to synchronize concurrent accesses. */ static gdb::mutex mutex; gdb::lock_guard lock (mutex); if (!bfd_check_format (sym_bfd.get (), bfd_object)) return NULL; ... accesses the sym_bfd.get () BFD, so it should be guarded by the global BFD lock. Fix this by: - adding a gdb_bfd_check_format that uses the global BFD lock, - using it in try_open_dwop_file instead of bfd_check_format, and - removing the local lock. The local lock also guarded a call to gdb_bfd_record_inclusion, which doesn't do any locking, so likewise use the global BFD lock in gdb_bfd_record_inclusion. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=33809 --- gdb/dwarf2/read.c | 15 ++++----------- gdb/gdb_bfd.c | 14 ++++++++++++-- gdb/gdb_bfd.h | 4 ++++ 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index efe0b046f15..c4979b1e494 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -6998,21 +6998,14 @@ try_open_dwop_file (dwarf2_per_bfd *per_bfd, const char *file_name, int is_dwp, if (sym_bfd == NULL) return NULL; - { - /* The operations below are not thread-safe, use a lock to synchronize - concurrent accesses. */ - static gdb::mutex mutex; - gdb::lock_guard lock (mutex); - - if (!bfd_check_format (sym_bfd.get (), bfd_object)) - return NULL; + if (!gdb_bfd_check_format (sym_bfd.get (), bfd_object)) + return NULL; - /* Success. Record the bfd as having been included by the objfile's bfd. + /* Success. Record the bfd as having been included by the objfile's bfd. This is important because things like demangled_names_hash lives in the objfile's per_bfd space and may have references to things like symbol names that live in the DWO/DWP file's per_bfd space. PR 16426. */ - gdb_bfd_record_inclusion (per_bfd->obfd, sym_bfd.get ()); - } + gdb_bfd_record_inclusion (per_bfd->obfd, sym_bfd.get ()); return sym_bfd; } diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c index 712cea494fa..bf91b4de155 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -1022,9 +1022,9 @@ gdb_bfd_openr_next_archived_file (bfd *archive, bfd *previous) void gdb_bfd_record_inclusion (bfd *includer, bfd *includee) { - struct gdb_bfd_data *gdata; + gdb::lock_guard guard (gdb_bfd_mutex); - gdata = (struct gdb_bfd_data *) bfd_usrdata (includer); + struct gdb_bfd_data *gdata = (struct gdb_bfd_data *) bfd_usrdata (includer); gdata->included_bfds.push_back (gdb_bfd_ref_ptr::new_reference (includee)); } @@ -1196,6 +1196,16 @@ gdb_bfd_canonicalize_symtab (bfd *abfd, bool should_throw) symbol_table.size () - 1); } +/* See gdb_bfd.h. */ + +bool +gdb_bfd_check_format (bfd *abfd, bfd_format format) +{ + gdb::lock_guard guard (gdb_bfd_mutex); + + return bfd_check_format (abfd, format); +} + /* Implement the 'maint info bfd' command. */ static void diff --git a/gdb/gdb_bfd.h b/gdb/gdb_bfd.h index 69bfa3011aa..2308e76fdd8 100644 --- a/gdb/gdb_bfd.h +++ b/gdb/gdb_bfd.h @@ -289,4 +289,8 @@ extern void gdb_bfd_init (); extern gdb::array_view gdb_bfd_canonicalize_symtab (bfd *abfd, bool should_throw = true); +/* A wrapper for bfd_check_format that acquires the BFD lock. */ + +extern bool gdb_bfd_check_format (bfd *abfd, bfd_format format); + #endif /* GDB_GDB_BFD_H */ -- 2.51.0