From patchwork Mon Aug 14 17:39:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jambor X-Patchwork-Id: 135582 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp2899407vqi; Mon, 14 Aug 2023 10:40:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFHTQesgI9TAvek3m8XDe3QDXTjIj25/2T8CTcX+MZUo6KpRcj+VzKh5S9nfg5K8nPXxgab X-Received: by 2002:a05:651c:c8:b0:2b9:ac03:360b with SMTP id 8-20020a05651c00c800b002b9ac03360bmr7257517ljr.19.1692034846790; Mon, 14 Aug 2023 10:40:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692034846; cv=none; d=google.com; s=arc-20160816; b=Lj8t53rfCY5UaE0A3ru1wWdYdcPOSHxotQdGNb62ss0ErPE7nIvn4zN7oHHbE1JBAU WUot52yAFVedYgy4f+RdH7lhhjReICLHFdlL5YdC5rKXbAUlPvAFu5TgRMD7djXDyrMf 2nyeyu9xIi+dkuFl0owhaGoThuvO4MANY7RmQAq33oOcZMeXJIPuXgZ9RBhZ/fTgUvYe d693/C/Ox+M4kzYqZUF1CoT5XCeHJwnVoGQvxQUUZP/wHHLtOsemY1r1IH1q+ESRBKvv YUGcMs9FkNeeBIDFoWmC+9NBnkKZeLFbmUsR59zohgb0lJVbziMVOaKcC2uk+OXHfGuI 2sZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:message-id:date :user-agent:subject:cc:to:from:dkim-signature:dkim-signature :dmarc-filter:delivered-to; bh=TOkwtvnxcd59dAf3hlkYbAWQP4QUnEmWqIT6UB2Ylx8=; fh=Kh9Sf7Cdr/XfCYf5LgzAL0DpO3YS4l97kMnQoqJ/KfA=; b=eUTJlWaH7sMFdmaVfCQCDWdAN4WKgSl4qd4K5wZpRKkqYqLEy0WGCnd7E2pChYH0WG /0LY1hU6Qs4dGZr7SD2bzX/peA5CtOfaINnkwKUSBXPsfH/eaclON9g6tUcqRxKKFwAf hri8Xt8w7zq2qwP8DPSNPWVkZM82w85rOX8isnEw8C+5FCwFG/yEd8iAPHkN45HCQknR hD/nFZCeb0ELjGLkK+TKMNkw60GTjd5QiQPiepncHQZiM3XetX2Q818Olrr6x7D5ztRa ZjSK6sIFSABJzz26JlKvnsLlAC/s4RIpBW3pFdpDPTvQMK7ehAq9JjW+wiDJkgoMMYCn XWNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=kxASH0Je; dkim=neutral (no key) header.i=@gcc.gnu.org header.s=susede2_ed25519 header.b=HmhIIMTa; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id s11-20020a170906060b00b0099bd1a98ad5si7860350ejb.734.2023.08.14.10.40.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Aug 2023 10:40:46 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=kxASH0Je; dkim=neutral (no key) header.i=@gcc.gnu.org header.s=susede2_ed25519 header.b=HmhIIMTa; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 21EBB385B515 for ; Mon, 14 Aug 2023 17:40:33 +0000 (GMT) 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 1AB663858C33; Mon, 14 Aug 2023 17:39:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1AB663858C33 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz 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 8B21A21963; Mon, 14 Aug 2023 17:39:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1692034797; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=TOkwtvnxcd59dAf3hlkYbAWQP4QUnEmWqIT6UB2Ylx8=; b=kxASH0JeCkDNcIPKX8Of95sT6JTZlPcv6KjdpG/jUyvOwA37MLIaGBtwE1aVOTOs/56xip XYJFA5nBMKA+B3SxULQHuF9zC+NNVmYtP3jclto1DjtCLBvtzgxABQ4spjHNArKFaBkgAY dsHhbWUYFAM/Zb27gB2996vWmpSih74= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1692034797; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type; bh=TOkwtvnxcd59dAf3hlkYbAWQP4QUnEmWqIT6UB2Ylx8=; b=HmhIIMTar63+ahDubyDoczm5oKgN784AKOXSAeTwICDSPzDcR5B8BGaxkQeldAqrOHorrJ 4tujujrANIdTmcCQ== 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 7F652138E2; Mon, 14 Aug 2023 17:39:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id LzYOH+1m2mRZUwAAMHmgww (envelope-from ); Mon, 14 Aug 2023 17:39:57 +0000 From: Martin Jambor To: GCC Patches , fortran@gcc.gnu.org Cc: Subject: [PATCH] Fortran: Avoid accessing gfc_charlen when not looking at BT_CHARACTER (PR 110677) User-Agent: Notmuch/0.37 (https://notmuchmail.org) Emacs/28.2 (x86_64-suse-linux-gnu) Date: Mon, 14 Aug 2023 19:39:57 +0200 Message-ID: MIME-Version: 1.0 X-Spam-Status: No, score=-11.5 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 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: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774227131663761865 X-GMAIL-MSGID: 1774227131663761865 Hello, this patch addresses an issue uncovered by the undefined behavior sanitizer. In function resolve_structure_cons in resolve.cc there is a test starting with: if (cons->expr->ts.type == BT_CHARACTER && comp->ts.u.cl && comp->ts.u.cl->length && comp->ts.u.cl->length->expr_type == EXPR_CONSTANT and UBSAN complained of loads from comp->ts.u.cl->length->expr_type of integer value 1818451807 which is outside of the value range expr_t enum. If I understand the code correctly it the entire load was unwanted because comp->ts.type in those cases is BT_CLASS and not BT_CHARACTER. This patch simply adds a check to make sure it is only accessed in those cases. I have verified that the UPBSAN failure goes away with this patch, it also passes bootstrap and testing on x86_64-linux. OK for master? Thanks, Martin gcc/fortran/ChangeLog: 2023-08-14 Martin Jambor PR fortran/110677 * resolve.cc (resolve_structure_cons): Check comp->ts is character type before accessing stuff through comp->ts.u.cl. --- gcc/fortran/resolve.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc index e7c8d919bef..5b4dfc5fcd2 100644 --- a/gcc/fortran/resolve.cc +++ b/gcc/fortran/resolve.cc @@ -1396,8 +1396,9 @@ resolve_structure_cons (gfc_expr *expr, int init) the one of the structure, ensure this if the lengths are known at compile time and when we are dealing with PARAMETER or structure constructors. */ - if (cons->expr->ts.type == BT_CHARACTER && comp->ts.u.cl - && comp->ts.u.cl->length + if (cons->expr->ts.type == BT_CHARACTER + && comp->ts.type == BT_CHARACTER + && comp->ts.u.cl && comp->ts.u.cl->length && comp->ts.u.cl->length->expr_type == EXPR_CONSTANT && cons->expr->ts.u.cl && cons->expr->ts.u.cl->length && cons->expr->ts.u.cl->length->expr_type == EXPR_CONSTANT