From patchwork Thu Jun 22 19:55:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Pan2 via Gcc-patches" X-Patchwork-Id: 111797 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp5308603vqr; Thu, 22 Jun 2023 12:58:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7ZYXmR+Txlh+rrzY7yRV/3aOeKBKZ9o7wophznIETGeUgJMhODxQy2scVa/uK5orOXNUl9 X-Received: by 2002:a17:907:940f:b0:98d:4b97:acc8 with SMTP id dk15-20020a170907940f00b0098d4b97acc8mr1799949ejc.25.1687463884791; Thu, 22 Jun 2023 12:58:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687463884; cv=none; d=google.com; s=arc-20160816; b=R8AdLnFez3wa4Fi7SYUxCKe/2hTxxw8frUuS1PFcUNYsijljv4b3qfyrrFfeH1c8+l r7KOlSghVG2Wn2xG4KjavFet+Bct3ba3QXAbeqfCMHr9xiTFo3zzr3IpVmkEurfFaoxt LTGBgkWygRlmzaJE4M3lVjJcnZTty8zJqbnrLrO7QwXo7YZcKhjKhxnZmqaqTO1zto1f EH30wXzNhWvOIa8J6HPdKasa2NDAsWewvqps1dn2orn0bzfYhZ+TFkVeWGtN3SL1s9+o CIhYIST4cpmalyGslwy5j0ePgIBWrPEXVcgadzw7xqaJOoyUfxO6GuxGBhXD5o60dVXv /JrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=cu6OPnu/CCbCa/Ouoz/1DBD/KHI87AgMhD++BDO2GIo=; b=duZNo7pXhsb/8SOcvRkc6uJW0JeVRTFw+waMj5RbBZDXL2uknEKgUjZxTCjSyAbFls wYMZPJ9Cvp+/vrSuY3WltFq1ZKJkNoOshUFgj/fG+HHIN4usmkZGIE+q+wQMUQt+Y+Rg QXUamrcSQPa9t0ZrsQw1TAy2fFPOeah4iV88a7+eUWU4fzXsHLISHbMmxfA2P+U3HVcw q/S/SLLmPg2WQDp9LvbU0ariArtqbFoSEviExnYvANCseo2SXKKPK84fbDo/aFk0ewz5 S+vCZh/X5esWroxa3HntQNx7AeK6AxKpiXAzX0r6JVjRgAqNbgySfQUomWINDZ/iluXT 7WEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=D8S+XR5t; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id s7-20020a170906168700b00988be9d8c53si3673251ejd.946.2023.06.22.12.58.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 12:58:04 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=D8S+XR5t; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7E81E3858C2B for ; Thu, 22 Jun 2023 19:58:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7E81E3858C2B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1687463883; bh=cu6OPnu/CCbCa/Ouoz/1DBD/KHI87AgMhD++BDO2GIo=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=D8S+XR5tEouiUUbS8tCdSLT4ZQLhtyaOpi7iLSpUtwXizB9frNTat4k8CHB3xGA/O nzjojzydseGHJEeXDpSJQOYG9r2R4LBvOoyMKAEpxFK6XGqr/VknhB7PoLtOoUnPSd /O9FgEU+e7X8i+JK1vTAvzOtr9X6wBk821ginWIE= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id 76F233858D35 for ; Thu, 22 Jun 2023 19:57:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 76F233858D35 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3fa71e253f2so10806675e9.0 for ; Thu, 22 Jun 2023 12:57:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687463838; x=1690055838; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cu6OPnu/CCbCa/Ouoz/1DBD/KHI87AgMhD++BDO2GIo=; b=RGNzXVleDEB7cjqqfm1Ns6Y+M3rj1Nubjay2Em1kxwPIw1hQ7jlTehskZPJuKs5Qdd yOIa/kXpMfKHciU01s8mKZ/L4g02iIFdxzWTKOY6wGbPOOR+/5NS9pAE4O0Ucog4Nn5b QUkrSb8p6b9KGNxtgFzK1Vc8UdeYbP3p7diOEFhYE6WwjgtfOyGZCodE6GUpOqImp0/C D8+TT5p5IZD6CMh4PBH8NFUMYRZ0iRA7oMW2catrUPRRlmUE7HY1EQPkqZWWvM+yoRww pbskCON6WjqLQDlcFfUWP0IqTSk2ws5PBC1Ezef7q9JDtZqf1A9/MXEqHdR5edUogfTj vNtg== X-Gm-Message-State: AC+VfDzs9A1X0+PC95cu0b7gV+3Wyl8HT1B8WZ8CZZoAUM4oZoRHyw9l 696vjsZDN0WL6HkW6a8rCJub5V5p8N6t X-Received: by 2002:a1c:6a19:0:b0:3fa:7b39:f13d with SMTP id f25-20020a1c6a19000000b003fa7b39f13dmr57015wmc.4.1687463837886; Thu, 22 Jun 2023 12:57:17 -0700 (PDT) Received: from localhost ([2a01:e0a:2ec:f0d0:c8e7:7043:db5a:a473]) by smtp.gmail.com with UTF8SMTPSA id a1-20020a05600c224100b003f9b44e5b7fsm313074wmm.46.2023.06.22.12.57.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 22 Jun 2023 12:57:17 -0700 (PDT) X-Google-Original-From: vultkayn@gcc.gnu.org To: gcc-patches@gcc.gnu.org Cc: benjamin priour , dmalcolm@redhat.com Subject: [PATCH] analyzer: Fix regression bug after r14-1632-g9589a46ddadc8b [pr110198] Date: Thu, 22 Jun 2023 21:55:24 +0200 Message-Id: <20230622195522.1834793-1-vultkayn@gcc.gnu.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: , X-Patchwork-Original-From: Benjamin Priour via Gcc-patches From: "Li, Pan2 via Gcc-patches" Reply-To: priour.be@gmail.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769434130255017903?= X-GMAIL-MSGID: =?utf-8?q?1769434130255017903?= From: benjamin priour Resend with proper subject line ... Hi, Below is the fix to regression bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110198 Was bootstrapped and regtested successfully on x86_64-linux-gnu Considering mishap from last patch, I'd would appreciate if you could also regtest it, to be sure :) Thanks, Benjamin. g++.dg/analyzer/pr100244.C was failing after a patch of PR109439. The reason was a spurious preemptive return of get_store_value upon out-of-bounds read that was preventing further checks. Now instead, a boolean value check_poisoned goes to false when a OOB is detected, and is later on given to get_or_create_initial_value. gcc/analyzer/ChangeLog: * region-model-manager.cc (region_model_manager::get_or_create_initial_value): Take an optional boolean value to bypass poisoning checks * region-model-manager.h: Update declaration of the above function. * region-model.cc (region_model::get_store_value): No longer returns on OOB, but rather gives a boolean to get_or_create_initial_value. (region_model::check_region_access): Update docstring. (region_model::check_region_for_write): Update docstring. Signed-off-by: benjamin priour --- gcc/analyzer/region-model-manager.cc | 5 +++-- gcc/analyzer/region-model-manager.h | 3 ++- gcc/analyzer/region-model.cc | 15 ++++++++------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/gcc/analyzer/region-model-manager.cc b/gcc/analyzer/region-model-manager.cc index 1453acf7bc9..4f11ef4bd29 100644 --- a/gcc/analyzer/region-model-manager.cc +++ b/gcc/analyzer/region-model-manager.cc @@ -293,9 +293,10 @@ region_model_manager::create_unique_svalue (tree type) necessary. */ const svalue * -region_model_manager::get_or_create_initial_value (const region *reg) +region_model_manager::get_or_create_initial_value (const region *reg, + bool check_poisoned) { - if (!reg->can_have_initial_svalue_p ()) + if (!reg->can_have_initial_svalue_p () && check_poisoned) return get_or_create_poisoned_svalue (POISON_KIND_UNINIT, reg->get_type ()); diff --git a/gcc/analyzer/region-model-manager.h b/gcc/analyzer/region-model-manager.h index 3340c3ebd1e..ff5333bf07c 100644 --- a/gcc/analyzer/region-model-manager.h +++ b/gcc/analyzer/region-model-manager.h @@ -49,7 +49,8 @@ public: tree type); const svalue *get_or_create_poisoned_svalue (enum poison_kind kind, tree type); - const svalue *get_or_create_initial_value (const region *reg); + const svalue *get_or_create_initial_value (const region *reg, + bool check_poisoned = true); const svalue *get_ptr_svalue (tree ptr_type, const region *pointee); const svalue *get_or_create_unaryop (tree type, enum tree_code op, const svalue *arg); diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc index 6bc60f89f3d..187013a37cc 100644 --- a/gcc/analyzer/region-model.cc +++ b/gcc/analyzer/region-model.cc @@ -2373,8 +2373,9 @@ region_model::get_store_value (const region *reg, if (reg->empty_p ()) return m_mgr->get_or_create_unknown_svalue (reg->get_type ()); + bool check_poisoned = true; if (check_region_for_read (reg, ctxt)) - return m_mgr->get_or_create_unknown_svalue(reg->get_type()); + check_poisoned = false; /* Special-case: handle var_decls in the constant pool. */ if (const decl_region *decl_reg = reg->dyn_cast_decl_region ()) @@ -2427,7 +2428,7 @@ region_model::get_store_value (const region *reg, == RK_GLOBALS) return get_initial_value_for_global (reg); - return m_mgr->get_or_create_initial_value (reg); + return m_mgr->get_or_create_initial_value (reg, check_poisoned); } /* Return false if REG does not exist, true if it may do. @@ -2790,7 +2791,7 @@ region_model::get_string_size (const region *reg) const /* If CTXT is non-NULL, use it to warn about any problems accessing REG, using DIR to determine if this access is a read or write. - Return TRUE if an UNKNOWN_SVALUE needs be created. + Return TRUE if an OOB access was detected. If SVAL_HINT is non-NULL, use it as a hint in diagnostics about the value that would be written to REG. */ @@ -2804,10 +2805,10 @@ region_model::check_region_access (const region *reg, if (!ctxt) return false; - bool need_unknown_sval = false; + bool oob_access_detected = false; check_region_for_taint (reg, dir, ctxt); if (!check_region_bounds (reg, dir, sval_hint, ctxt)) - need_unknown_sval = true; + oob_access_detected = true; switch (dir) { @@ -2820,7 +2821,7 @@ region_model::check_region_access (const region *reg, check_for_writable_region (reg, ctxt); break; } - return need_unknown_sval; + return oob_access_detected; } /* If CTXT is non-NULL, use it to warn about any problems writing to REG. */ @@ -2834,7 +2835,7 @@ region_model::check_region_for_write (const region *dest_reg, } /* If CTXT is non-NULL, use it to warn about any problems reading from REG. - Returns TRUE if an unknown svalue needs be created. */ + Returns TRUE if an OOB read was detected. */ bool region_model::check_region_for_read (const region *src_reg,