From patchwork Thu Aug 24 14:39:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 136838 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp1168900vqm; Thu, 24 Aug 2023 07:43:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGL9wIg+GILvX9aUDUWvFhzYDlzn7N3DhzGaEk84erkw+s0xxFp3AIhBx5Mp4wEpTxSXjf/ X-Received: by 2002:a05:6512:3406:b0:4f8:7781:9870 with SMTP id i6-20020a056512340600b004f877819870mr13385980lfr.60.1692888215807; Thu, 24 Aug 2023 07:43:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692888215; cv=none; d=google.com; s=arc-20160816; b=VJaOZKEW/3i5JfDQMSEsD5KLPSyaW/rUHzjvUELRmc9JRznce53aOdwxYrs+kCwiFy 2pHc/3Y4pKmEBU2coQ/xjIQ6mFP93KGJaCrrY9WKGrhBBxVjsNIh5RpiXAQ3bSEQskv3 scdhIIjn6HHzpvMgh9CBHSzvMCya+JlS6Sj7vwF4vyiJ6iDHVjA9/NSBWAXYvH9gSYv/ F3xH5H8goXtxm0dtYs8YJV1nnuGMPotpk/TRTCZ+KGdkly3mB92PO8Gf2ScTMda0XqEE OpCk5dJuFooEh4CKMlzjLthATKontUQE29JSY7xin++r3Qw5LLPdBMjABg0JuEYgwPHO lroQ== 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:references:in-reply-to :message-id:date:subject:cc:to:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=xqGuJARd4NLsbiTKIN/l8fhdX7YVMkkxVm4SOKch7mo=; fh=fa0YJSH7y4k0snNuxsKgOI6vGP7j2f0jR9F1WHC95UA=; b=vqtC4Q8FNKM9FQwDRJYfdOHj1rZ5QbU2yZwBe+aUHBv4bNXqh9l+gNVOU9ufxt1TuD R5fV2XOB4nJwve1D47vN9MUK7PjiXyxw2kzsZ8HOQ1yJSRl8S8wMN9eAuVGqXBFhiGlj C6dWhyGPuDDVx5EnIF37XSTuDWprnNOvAPhE2HghWL/ZxoxlqMzy66Yim/6s32UypTmr ypQ9AI5cPQW4CW1sY+nAtGExndwaB99NMZrSKLJ0JrCzs2TXS5g9xZ0hOi46FPlPJ3Gr GfzpIU1YVW6CzLKVVIa/ssQFaz1jw8C3F10V0TKus/2Zht4I7VraX8k38TAgwlKibJlF GPIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=jZJjIyyT; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=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 j6-20020a50ed06000000b0052a025456e6si7635894eds.148.2023.08.24.07.43.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 07:43:35 -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=@gcc.gnu.org header.s=default header.b=jZJjIyyT; 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"; 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 1E5603882024 for ; Thu, 24 Aug 2023 14:41:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E5603882024 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1692888060; bh=xqGuJARd4NLsbiTKIN/l8fhdX7YVMkkxVm4SOKch7mo=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=jZJjIyyT0dmwlInRD2Iv2wH3SS0TC+OdNry49FfWMwuic5yfXKHZC5FDP+wigt84c nJMssrSw8850rILRXfeMPSZqkKozfTUPBt4HcHXWcXeMMN7uQgGbw5RwORPSomsDwT CEDRsC8xX+TTmi5lkXhVnCEjL6P8R3eI+iDpaF60= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id B10773858296 for ; Thu, 24 Aug 2023 14:39:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B10773858296 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-447-dFAwcLjNNMe9w2OV2lj_bg-1; Thu, 24 Aug 2023 10:39:07 -0400 X-MC-Unique: dFAwcLjNNMe9w2OV2lj_bg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5478810AFD03 for ; Thu, 24 Aug 2023 14:39:07 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.32.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 045EE40D2839; Thu, 24 Aug 2023 14:39:06 +0000 (UTC) To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [PATCH 6/9] analyzer: handle strlen(INIT_VAL(STRING_REG)) [PR105899] Date: Thu, 24 Aug 2023 10:39:00 -0400 Message-Id: <20230824143903.3161185-7-dmalcolm@redhat.com> In-Reply-To: <20230824143903.3161185-1-dmalcolm@redhat.com> References: <20230824143903.3161185-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.4 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_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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: , X-Patchwork-Original-From: David Malcolm via Gcc-patches From: David Malcolm Reply-To: David Malcolm Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775121953857485321 X-GMAIL-MSGID: 1775121953857485321 gcc/analyzer/ChangeLog: PR analyzer/105899 * region-model.cc (fragment::has_null_terminator): Move STRING_CST handling to fragment::string_cst_has_null_terminator; also use it to handle INIT_VAL(STRING_REG). (fragment::string_cst_has_null_terminator): New, from above. gcc/testsuite/ChangeLog: PR analyzer/105899 * gcc.dg/analyzer/strcpy-3.c (test_2): New. --- gcc/analyzer/region-model.cc | 68 ++++++++++++++++-------- gcc/testsuite/gcc.dg/analyzer/strcpy-3.c | 7 +++ 2 files changed, 54 insertions(+), 21 deletions(-) diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc index 00c306ab7dae..6574ec140074 100644 --- a/gcc/analyzer/region-model.cc +++ b/gcc/analyzer/region-model.cc @@ -3310,27 +3310,10 @@ struct fragment switch (TREE_CODE (cst)) { case STRING_CST: - { - /* Look for the first 0 byte within STRING_CST - from START_READ_OFFSET onwards. */ - const HOST_WIDE_INT num_bytes_to_search - = std::min ((TREE_STRING_LENGTH (cst) - - rel_start_read_offset_hwi), - available_bytes_hwi); - const char *start = (TREE_STRING_POINTER (cst) - + rel_start_read_offset_hwi); - if (num_bytes_to_search >= 0) - if (const void *p = memchr (start, 0, - num_bytes_to_search)) - { - *out_bytes_read = (const char *)p - start + 1; - return tristate (true); - } - - *out_bytes_read = available_bytes; - return tristate (false); - } - break; + return string_cst_has_null_terminator (cst, + rel_start_read_offset_hwi, + available_bytes_hwi, + out_bytes_read); case INTEGER_CST: if (rel_start_read_offset_hwi == 0 && integer_onep (TYPE_SIZE_UNIT (TREE_TYPE (cst)))) @@ -3357,12 +3340,55 @@ struct fragment } } break; + + case SK_INITIAL: + { + const initial_svalue *initial_sval = (const initial_svalue *)m_sval; + const region *reg = initial_sval->get_region (); + if (const string_region *string_reg = reg->dyn_cast_string_region ()) + { + tree string_cst = string_reg->get_string_cst (); + return string_cst_has_null_terminator (string_cst, + rel_start_read_offset_hwi, + available_bytes_hwi, + out_bytes_read); + } + return tristate::TS_UNKNOWN; + } + break; + default: // TODO: it may be possible to handle other cases here. return tristate::TS_UNKNOWN; } } + static tristate + string_cst_has_null_terminator (tree string_cst, + HOST_WIDE_INT rel_start_read_offset_hwi, + HOST_WIDE_INT available_bytes_hwi, + byte_offset_t *out_bytes_read) + { + /* Look for the first 0 byte within STRING_CST + from START_READ_OFFSET onwards. */ + const HOST_WIDE_INT num_bytes_to_search + = std::min ((TREE_STRING_LENGTH (string_cst) + - rel_start_read_offset_hwi), + available_bytes_hwi); + const char *start = (TREE_STRING_POINTER (string_cst) + + rel_start_read_offset_hwi); + if (num_bytes_to_search >= 0) + if (const void *p = memchr (start, 0, + num_bytes_to_search)) + { + *out_bytes_read = (const char *)p - start + 1; + return tristate (true); + } + + *out_bytes_read = available_bytes_hwi; + return tristate (false); + } + byte_range m_byte_range; const svalue *m_sval; }; diff --git a/gcc/testsuite/gcc.dg/analyzer/strcpy-3.c b/gcc/testsuite/gcc.dg/analyzer/strcpy-3.c index abb49bc39f27..a7b324fc445e 100644 --- a/gcc/testsuite/gcc.dg/analyzer/strcpy-3.c +++ b/gcc/testsuite/gcc.dg/analyzer/strcpy-3.c @@ -22,3 +22,10 @@ void test_1 (void) __analyzer_eval (result[5] == 0); /* { dg-warning "TRUE" } */ __analyzer_eval (strlen (result) == 5); /* { dg-warning "TRUE" } */ } + +void test_2 (void) +{ + char buf[16]; + __builtin_strcpy (buf, "abc"); + __analyzer_eval (strlen (buf) == 3); /* { dg-warning "TRUE" } */ +}