From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id eYTHJwVAF2pH5iAAWB0awg (envelope-from ) for ; Wed, 27 May 2026 15:03:33 -0400 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=DBTeUD4Y; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ZR52X1md; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=ZJlcASb5; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=VXUbGZPB; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 9C0EC1E0A3; Wed, 27 May 2026 15:03:33 -0400 (EDT) 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 E95C01E024 for ; Wed, 27 May 2026 15:03:32 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6016F4BA2E29 for ; Wed, 27 May 2026 19:03:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6016F4BA2E29 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=DBTeUD4Y; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ZR52X1md; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=ZJlcASb5; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=VXUbGZPB Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 21C904BA2E13 for ; Wed, 27 May 2026 19:02:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 21C904BA2E13 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 21C904BA2E13 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1779908550; cv=none; b=KhATFzbeeMovHaAALLbXaFBywo9JixYn1S2ARB+WD1w25OW2pkV/TkGHvLdoWMjmXKH2XJpmAmQshm9+dNteBUiTUBvZe5hVMiEQRzfoK0YKPNPEYpD3eQ/oZZ3IrLdGCePXM7+A/3Wh+ad5GmkF8Hvc1txQjP0TFkJ95nhqwRY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1779908550; c=relaxed/simple; bh=NqXmFzgXe0QSLM3DcwKPjb3odeDx2l/Df3km3p+/M08=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=Oiq5DxyZ2BQUOpE3A5iYle8bQF6wyKGRHVwDlgacvNmnmoovtxhAwP5H2VXC/mfAswdUv3hyzrK9vua6jJUFlx5NU9kXS5syQJQhNoN/mCC+agWB807r2X+8r6Vg5I4v2kJ1jXhJREVs9WwZi82ImZ2sR8n/rptnPHXWXpJIkuQ= ARC-Authentication-Results: i=1; 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=DBTeUD4Y; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ZR52X1md; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=ZJlcASb5; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=VXUbGZPB DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 21C904BA2E13 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-out1.suse.de (Postfix) with ESMTPS id F1B106A818 for ; Wed, 27 May 2026 19:02:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1779908549; 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=m0kZF0u7QTkuaDlBnGPKjjzVOPVGG9G9+ZzwWUeHrBY=; b=DBTeUD4YnZZHrBKNfGtCsgvMpQu41uEzFXjEqXC+1JlavZxkjdhkgRQsOuZhWWObShF9M8 eNrYwp0u/yuY3sg18bKG1ZVu1qw22iA4UBKE6Qx1Zo5E41ick0Zq2DaPkkn9/GedWdH9k5 acPGKnc6nB38DaTMDDJS7AWE48B5NF8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1779908549; 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=m0kZF0u7QTkuaDlBnGPKjjzVOPVGG9G9+ZzwWUeHrBY=; b=ZR52X1mdpOcY5olGvY6qFM8K/OSjPMTHB0OClelQk2zORhbmDiEoUE9jA07o6ieVQhQXbn uU55wQae6svsHIAA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=ZJlcASb5; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=VXUbGZPB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1779908548; 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=m0kZF0u7QTkuaDlBnGPKjjzVOPVGG9G9+ZzwWUeHrBY=; b=ZJlcASb5tolut1xzJ94NajIUafLf3fj/aas9EvNW1O2LK5aMEbx27QO/HU4NafIC2OIPOb PtIDhLT6Kg8Cnxj4kif0KBe8WnASvM3lMgNuGaMOCSr3OyxXkwxEcAjmrnossQsD7+Bc+9 2TwHG+9JCVkbhPTTSuHd2pZRR5Nw1Uc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1779908548; 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=m0kZF0u7QTkuaDlBnGPKjjzVOPVGG9G9+ZzwWUeHrBY=; b=VXUbGZPBdvT6houzNwX5oUrDQWTrBjrD9AoDJZJm+U+VsDLteekL0Iub+/1vAxvg9PdGpf mPWO5ydrsX59k3Bw== 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 D988D5A997 for ; Wed, 27 May 2026 19:02:28 +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 oCvnM8Q/F2oldgAAD6G6ig (envelope-from ) for ; Wed, 27 May 2026 19:02:28 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 2/2] [gdb/symtab] Fix data race in try_open_dwop_file Date: Wed, 27 May 2026 21:02:28 +0200 Message-ID: <20260527190228.3656310-3-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260527190228.3656310-1-tdevries@suse.de> References: <20260527190228.3656310-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: F1B106A818 X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; 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)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; FROM_EQ_ENVFROM(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[suse.de:+] 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: - using the global BFD lock in gdb_bfd_check_format, and - removing the local lock. Likewise, use the global BFD lock in gdb_bfd_check_format_matches. 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 | 8 ++++++-- gdb/gdb_bfd.h | 4 ++-- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 8067af5f52e..742be7656b1 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -6744,21 +6744,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 (!gdb_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 7a845d6e04b..749d19789cf 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -1026,9 +1026,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)); } @@ -1205,6 +1205,8 @@ gdb_bfd_canonicalize_symtab (bfd *abfd, bool should_throw) bool gdb_bfd_check_format (bfd *abfd, bfd_format format) { + gdb::lock_guard guard (gdb_bfd_mutex); + return bfd_check_format (abfd, format); } @@ -1213,6 +1215,8 @@ gdb_bfd_check_format (bfd *abfd, bfd_format format) bool gdb_bfd_check_format_matches (bfd *abfd, bfd_format format, char ***matching) { + gdb::lock_guard guard (gdb_bfd_mutex); + return bfd_check_format_matches (abfd, format, matching); } diff --git a/gdb/gdb_bfd.h b/gdb/gdb_bfd.h index ff9f2337e6e..09b544b3b26 100644 --- a/gdb/gdb_bfd.h +++ b/gdb/gdb_bfd.h @@ -289,11 +289,11 @@ 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. */ +/* A wrapper for bfd_check_format that acquires the BFD lock. */ extern bool gdb_bfd_check_format (bfd *abfd, bfd_format format); -/* A wrapper for bfd_check_format_matches. */ +/* A wrapper for bfd_check_format_matches that acquires the BFD lock. */ extern bool gdb_bfd_check_format_matches (bfd *abfd, bfd_format format, char ***matching); -- 2.51.0