From patchwork Wed Jul 28 18:51:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 1510970 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=ZoYxBG3H; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GZjSZ0Cyfz9sWS for ; Thu, 29 Jul 2021 04:51:58 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 888E839A3C2D for ; Wed, 28 Jul 2021 18:51:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 888E839A3C2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1627498315; bh=wDTRH+S5MyBJTu0aH/FIR31GwQYgKu6+Lr/ZfBNq+/8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ZoYxBG3H66JAdV65PFUX+Dnr8YDlT43KqUcF1ClZyW6Y5zRgpYzGksHpTpeBe83aW pCSZvWO1PZ9dp4etZu+3IpgyGARv+qYVdn6XPEGWDVhunhX1GGU1wiDqKfPSf3QeMj 7zgHEzKO4JSMkdHGgel/kraErWlvP0f26lwSPbLo= 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.133.124]) by sourceware.org (Postfix) with ESMTP id 5D7C53853C36 for ; Wed, 28 Jul 2021 18:51:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5D7C53853C36 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-122-XljLmwtJNnePI0YNSfiyLA-1; Wed, 28 Jul 2021 14:51:32 -0400 X-MC-Unique: XljLmwtJNnePI0YNSfiyLA-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 EDD20189CD03 for ; Wed, 28 Jul 2021 18:51:31 +0000 (UTC) Received: from t14s.localdomain.com (ovpn-113-57.phx2.redhat.com [10.3.113.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99A7C60877; Wed, 28 Jul 2021 18:51:31 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [committed] analyzer: play better with -fsanitize=bounds Date: Wed, 28 Jul 2021 14:51:30 -0400 Message-Id: <20210728185130.920358-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 X-Spam-Status: No, score=-13.6 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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: David Malcolm via Gcc-patches From: David Malcolm Reply-To: David Malcolm Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to trunk as 37eb3ef48c9840475646528751b5f8ffb7eb34ce. gcc/analyzer/ChangeLog: * region-model.cc (region_model::on_call_pre): Treat IFN_UBSAN_BOUNDS, BUILT_IN_STACK_SAVE, and BUILT_IN_STACK_RESTORE as no-ops, rather than handling them as unknown functions. gcc/testsuite/ChangeLog: * gcc.dg/analyzer/torture/ubsan-1.c: New test. Signed-off-by: David Malcolm --- gcc/analyzer/region-model.cc | 6 ++ .../gcc.dg/analyzer/torture/ubsan-1.c | 60 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/analyzer/torture/ubsan-1.c diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc index 92fa917d14d..1bc411b2ed6 100644 --- a/gcc/analyzer/region-model.cc +++ b/gcc/analyzer/region-model.cc @@ -1082,6 +1082,8 @@ region_model::on_call_pre (const gcall *call, region_model_context *ctxt, case IFN_BUILTIN_EXPECT: impl_call_builtin_expect (cd); return false; + case IFN_UBSAN_BOUNDS: + return false; } } @@ -1137,6 +1139,10 @@ region_model::on_call_pre (const gcall *call, region_model_context *ctxt, impl_call_strlen (cd); return false; + case BUILT_IN_STACK_SAVE: + case BUILT_IN_STACK_RESTORE: + return false; + /* Stdio builtins. */ case BUILT_IN_FPRINTF: case BUILT_IN_FPRINTF_UNLOCKED: diff --git a/gcc/testsuite/gcc.dg/analyzer/torture/ubsan-1.c b/gcc/testsuite/gcc.dg/analyzer/torture/ubsan-1.c new file mode 100644 index 00000000000..b9f34f166ba --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/torture/ubsan-1.c @@ -0,0 +1,60 @@ +/* { dg-skip-if "" { *-*-* } { "-fno-fat-lto-objects" } { "" } } */ +/* { dg-additional-options "-fsanitize=bounds" } */ + +#include +#include "../analyzer-decls.h" + +int test_1 (int *arr, int i, int n) +{ + if (i >= n) + return 0; + return arr[i]; +} + +int test_2 (int *arr, int i, int n) +{ + if (i >= n) + return 0; + if (arr[i]) + __analyzer_eval (arr[i]); /* { dg-warning "TRUE" } */ + else + __analyzer_eval (arr[i]); /* { dg-warning "FALSE" } */ +} + +int test_3 (int arr[], int i, int n) +{ + if (i >= n) + return 0; + if (arr[i]) + __analyzer_eval (arr[i]); /* { dg-warning "TRUE" } */ + else + __analyzer_eval (arr[i]); /* { dg-warning "FALSE" } */ +} + +void test_4 (int i, int n) +{ + int arr[n]; + arr[i] = 42; + __analyzer_eval (arr[i] == 42); /* { dg-warning "TRUE" } */ +} + +void test_5 (int i, int n) +{ + int *arr = malloc (sizeof(int) * n); + if (arr) + { + arr[i] = 42; + __analyzer_eval (arr[i] == 42); /* { dg-warning "TRUE" } */ + } + free (arr); +} + +int global; + +void test_6 (int i, int n) +{ + int arr[n]; + int saved = global; + arr[i] = 42; + __analyzer_eval (saved == global); /* { dg-warning "TRUE" } */ +}