From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 2EFD1393D022 for ; Wed, 6 Jan 2021 01:59:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2EFD1393D022 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-585-cKR-x1uyNNSIYn4_-T9tLA-1; Tue, 05 Jan 2021 20:59:50 -0500 X-MC-Unique: cKR-x1uyNNSIYn4_-T9tLA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1692C800D62 for ; Wed, 6 Jan 2021 01:59:50 +0000 (UTC) Received: from t470.redhat.com (ovpn-112-159.phx2.redhat.com [10.3.112.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id B480A7095D; Wed, 6 Jan 2021 01:59:49 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Subject: [committed] analyzer: fix false leaks when writing through unknown ptrs [PR97072] Date: Tue, 5 Jan 2021 20:59:48 -0500 Message-Id: <20210106015948.3117342-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Wed, 06 Jan 2021 01:59:54 -0000 Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to master as r11-6497-gac3966e315ada63eb379d560a012fa77c3909155. gcc/analyzer/ChangeLog: PR analyzer/97072 * region-model-reachability.cc (reachable_regions::init_cluster): Convert symbolic region handling to a switch statement. Add cases to handle SK_UNKNOWN and SK_CONJURED. gcc/testsuite/ChangeLog: PR analyzer/97072 * gcc.dg/analyzer/pr97072.c: New test. --- gcc/analyzer/region-model-reachability.cc | 36 +++++++++++++++++------ gcc/testsuite/gcc.dg/analyzer/pr97072.c | 9 ++++++ 2 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/analyzer/pr97072.c diff --git a/gcc/analyzer/region-model-reachability.cc b/gcc/analyzer/region-model-reachability.cc index daf785254ea..a988ffc1439 100644 --- a/gcc/analyzer/region-model-reachability.cc +++ b/gcc/analyzer/region-model-reachability.cc @@ -88,20 +88,38 @@ reachable_regions::init_cluster (const region *base_reg) if (m_store->escaped_p (base_reg)) add (base_reg, true); - /* If BASE_REG is *INIT_VAL(REG) for some other REG, see if REG is - unbound and untouched. If so, then add BASE_REG as a root. */ if (const symbolic_region *sym_reg = base_reg->dyn_cast_symbolic_region ()) { const svalue *ptr = sym_reg->get_pointer (); - if (const initial_svalue *init_sval = ptr->dyn_cast_initial_svalue ()) + switch (ptr->get_kind ()) { - const region *init_sval_reg = init_sval->get_region (); - const region *other_base_reg = init_sval_reg->get_base_region (); - const binding_cluster *other_cluster - = m_store->get_cluster (other_base_reg); - if (other_cluster == NULL - || !other_cluster->touched_p ()) + default: + break; + case SK_INITIAL: + { + /* If BASE_REG is *INIT_VAL(REG) for some other REG, see if REG is + unbound and untouched. If so, then add BASE_REG as a root. */ + const initial_svalue *init_sval + = as_a (ptr); + const region *init_sval_reg = init_sval->get_region (); + const region *other_base_reg = init_sval_reg->get_base_region (); + const binding_cluster *other_cluster + = m_store->get_cluster (other_base_reg); + if (other_cluster == NULL + || !other_cluster->touched_p ()) + add (base_reg, true); + } + break; + + case SK_UNKNOWN: + case SK_CONJURED: + { + /* If this cluster is due to dereferencing an unknown/conjured + pointer, any values written through the pointer could still + be live. */ add (base_reg, true); + } + break; } } } diff --git a/gcc/testsuite/gcc.dg/analyzer/pr97072.c b/gcc/testsuite/gcc.dg/analyzer/pr97072.c new file mode 100644 index 00000000000..40241248884 --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/pr97072.c @@ -0,0 +1,9 @@ +void unknown_fn_1 (void *); + +void test_1 (int co, int y) +{ + void *p = __builtin_malloc (1024); + void **q; + unknown_fn_1 (&q); + *q = p; +} -- 2.26.2