From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5369C4321E for ; Sat, 13 Nov 2021 20:37:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A764D61177 for ; Sat, 13 Nov 2021 20:37:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233346AbhKMUkl (ORCPT ); Sat, 13 Nov 2021 15:40:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25323 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234306AbhKMUkl (ORCPT ); Sat, 13 Nov 2021 15:40:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636835868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HZIiCx8ER1sk7j0VzxqjwHljZWuSHPOvv9JoO+KrwJQ=; b=EmmnpZ8bqI9RlPx/2uuDkV3zFyVhlx4HHHSkVhP0ICX7cu+2Z5VXlCaEySGw1B6125CSnE 4jCdN9nlbo4vlMC0+YhuwQQnyAdG3BWe+y4xDwIfReUtdgypZlT58b3Z1Zwwive/FiTgiu TqJGtacV8xuDX1DMKtGCJypXpm7Dus4= 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-531-VuIzoXGnOkKXxTv71nLdAg-1; Sat, 13 Nov 2021 15:37:44 -0500 X-MC-Unique: VuIzoXGnOkKXxTv71nLdAg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 700981006AA1; Sat, 13 Nov 2021 20:37:43 +0000 (UTC) Received: from t14s.localdomain.com (ovpn-113-54.phx2.redhat.com [10.3.113.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 038C619D9D; Sat, 13 Nov 2021 20:37:42 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org, linux-toolchains@vger.kernel.org Cc: David Malcolm Subject: [PATCH 4b/6] analyzer: implement region::untrusted_p in terms of __attribute__((untrusted)) Date: Sat, 13 Nov 2021 15:37:30 -0500 Message-Id: <20211113203732.2098220-7-dmalcolm@redhat.com> In-Reply-To: <20211113203732.2098220-1-dmalcolm@redhat.com> References: <20211113203732.2098220-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dmalcolm@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Precedence: bulk List-ID: X-Mailing-List: linux-toolchains@vger.kernel.org gcc/analyzer/ChangeLog: * region.cc (region::untrusted_p): Implement in terms of __attribute__((untrusted)). gcc/testsuite/ChangeLog: * gcc.dg/analyzer/test-uaccess.h: Change from custom_address_space pragma to __attribute__((untrusted)). Signed-off-by: David Malcolm --- gcc/analyzer/region.cc | 19 +++++++++++++++---- gcc/testsuite/gcc.dg/analyzer/test-uaccess.h | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/gcc/analyzer/region.cc b/gcc/analyzer/region.cc index b84504dbe42..52e9fa2d1e6 100644 --- a/gcc/analyzer/region.cc +++ b/gcc/analyzer/region.cc @@ -672,10 +672,21 @@ region::symbolic_for_unknown_ptr_p () const bool region::untrusted_p () const { - addr_space_t as = get_addr_space (); - /* FIXME: treat all non-generic address spaces as untrusted for now. */ - if (!ADDR_SPACE_GENERIC_P (as)) - return true; + const region *iter = this; + while (iter) + { + if (iter->get_type ()) + return TYPE_UNTRUSTED (iter->get_type ()); + switch (iter->get_kind ()) + { + default: + iter = iter->get_parent_region (); + continue; + case RK_CAST: + iter = iter->dyn_cast_cast_region ()->get_original_region (); + continue; + } + } return false; } diff --git a/gcc/testsuite/gcc.dg/analyzer/test-uaccess.h b/gcc/testsuite/gcc.dg/analyzer/test-uaccess.h index 0500e20b22b..280f4045418 100644 --- a/gcc/testsuite/gcc.dg/analyzer/test-uaccess.h +++ b/gcc/testsuite/gcc.dg/analyzer/test-uaccess.h @@ -2,7 +2,7 @@ /* Adapted from include/linux/compiler.h */ -#pragma GCC custom_address_space(__user) +#define __user __attribute__((untrusted)) /* Adapted from include/asm-generic/uaccess.h */ -- 2.26.3