From patchwork Mon Jan 17 14:32:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 50110 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B8D143858034 for ; Mon, 17 Jan 2022 14:32:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B8D143858034 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1642429950; bh=95nsGlIFz38sOMfXnTZUEQnIGtm41wHZGR8z2OueGaE=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=A22ki9LGFzT2ZbaZixhwm3T/i6lM0frhz5OjhOSUAsRXmPtZsfVudz5JIhvJ+tPc8 98GUeNkvtWeovV2OI9ifokD3BqOn6RIQyDLT78jgBQ9DJENFxejEPoB0m/Y7y8PSzF dTA96J0OQ81ctx61dJqYRpn01jDehJMn3bI3BXZc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 1B6043858416 for ; Mon, 17 Jan 2022 14:32:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1B6043858416 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id EE852212B6 for ; Mon, 17 Jan 2022 14:32:00 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id DB62D13C0E for ; Mon, 17 Jan 2022 14:32:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 3JhlNOB95WH3GgAAMHmgww (envelope-from ) for ; Mon, 17 Jan 2022 14:32:00 +0000 Date: Mon, 17 Jan 2022 15:32:00 +0100 (CET) To: gcc-patches@gcc.gnu.org Subject: [PATCH] middle-end/101292 - invalid memory access with warning control Message-ID: <7pq3onsr-r66r-s43o-7p4-9n5o5672q1q@fhfr.qr> MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The warning control falls into the C++ trap of using a reference to old hashtable contents for a put operation which can end up re-allocating that before reading from the old freed referenced to source. Fixed by introducing a temporary. Bootstrap & regtest running on x86_64-unknown-linux-gnu. 2022-01-17 Richard Biener PR middle-end/101292 * diagnostic-spec.c (copy_warning): Make sure to not reference old hashtable content on possible resize. * warning-control.cc (copy_warning): Likewise. --- gcc/diagnostic-spec.c | 5 ++++- gcc/warning-control.cc | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/diagnostic-spec.c b/gcc/diagnostic-spec.c index a8af229d677..4341ccfaae9 100644 --- a/gcc/diagnostic-spec.c +++ b/gcc/diagnostic-spec.c @@ -195,7 +195,10 @@ copy_warning (location_t to, location_t from) else { if (from_spec) - nowarn_map->put (to, *from_spec); + { + nowarn_spec_t tem = *from_spec; + nowarn_map->put (to, tem); + } else nowarn_map->remove (to); } diff --git a/gcc/warning-control.cc b/gcc/warning-control.cc index f9808bf4392..fa39ecab421 100644 --- a/gcc/warning-control.cc +++ b/gcc/warning-control.cc @@ -206,7 +206,8 @@ void copy_warning (ToType to, FromType from) gcc_assert (supp); gcc_checking_assert (nowarn_map); - nowarn_map->put (to_loc, *from_spec); + nowarn_spec_t tem = *from_spec; + nowarn_map->put (to_loc, tem); } else {