From patchwork Fri Dec 8 21:03:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 176033 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5718366vqy; Fri, 8 Dec 2023 13:03:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IEcRwhafXgSjtEI+nBJ39fSa8cRyEzJ1zQ2tSsSOHVzAlT026J2tqLZkYo88IP6EWuUj1MY X-Received: by 2002:a05:6102:e13:b0:466:3b2:f462 with SMTP id o19-20020a0561020e1300b0046603b2f462mr936685vst.20.1702069416786; Fri, 08 Dec 2023 13:03:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1702069416; cv=pass; d=google.com; s=arc-20160816; b=SDAo3TRuKEwMxiBAyTTpxhREBY0BvE7a3LLOB61Gd/xSDzple6RcAmCJCzPePSc2hV xVkhPC/xJDyLLq+ixAlXOWDrBkySGB5ZhoWMijONIQit1QTXO1ffADG4vj1YzPXMx8ph PB5Fg7UCywdDZBmA6o9YKWPUBDCzl+cB2jQwZU4fG748DJVUnNhpR2Dl95lZbZYgrINA qrLKu6lHta03E/bY5eCA219Amic7I9bcotYSrMFYkbI18RsPlhcezOO43fca4waaa43r Bd57qW5DlyRvPG7DSUWtCN0JSn05Gvw/+5k+npZyvhK/tKssTzFTd2ISGmEAhLV0TYx0 RXDQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=GClJ9/PeQzppffa8FhCs+geX2q77HCK3jJK/yFrAVO4=; fh=NXemEfxTRbZtBxUkxR2ehQUaYlcDfMdzPkO8MChVQE4=; b=xxnG3Dn1wixxIvPvCTOMwiOAyRdLRnVZJS9JcmWHmXPbNvFWwlmCi9tza0jw4jPAkl 0798huQdaqx+TkeiN5VaGURR3X5xQSe/FTesr67cjxp82PNM1FauT/GsFuniuZ+EJRcX jN4FGqyySWcZVgAmTNaXsX/hVgGi+/1ki6M159gDpoUW0zRdkr25q/sPQjeVB5XHwtZx lInq120beadpxkmYMV6R7GZxzz2IfA2sR97qwYCNPVfKQYScHXz0aUcVlNd5BtfyHaLe FzSd+17ISMAob1hYz/VaimP+qvdZPTf8QiI+vj6mUiGo2vBsaIDoZDi6e1olPrVCeZrc aNJg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=jMuZ1aHD; arc=pass (i=1); 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=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id x8-20020a056102090800b0046437b84b2esi713892vsh.728.2023.12.08.13.03.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 13:03:36 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=jMuZ1aHD; arc=pass (i=1); 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=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5F378385842F for ; Fri, 8 Dec 2023 21:03:36 +0000 (GMT) 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 ESMTPS id 3233F3858C36 for ; Fri, 8 Dec 2023 21:03:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3233F3858C36 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3233F3858C36 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702069392; cv=none; b=B6By6wXyezMAt30Hu0zMwcfJze4IciTqbJYh0R1pBBX8XyWSwDuO4ae4UIYbhUcBamQSAb1xepVNjFWwT6rw7MwtGK2BBW2z/YKuVHMHCGoX+WqTPOt0byfTgRJQ68WNsCBOgwZ8KKbYDLoLsplFFfsMJu2GHoDZPtlyoca2PIM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702069392; c=relaxed/simple; bh=malQA2R8KpCsrqBlnWeS/UW+XkSi1gbZ3TjjmTjB24o=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=XytY1aEYj9ImcieHQJV/WuqFF8hPE5Ern33IH5iVhL3iX/v/OGO8+y6NP19/EktxTo7pENwFLHJ1jzL2LfG0Af9Z8jJlsfS72xfXGfwXGT5c2ctfdHd2kN/yJoSWr8YbaGh/f7NRpoULfhAutwWoF3Zm81h3XmW38Ttk4PaKf24= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702069390; 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; bh=GClJ9/PeQzppffa8FhCs+geX2q77HCK3jJK/yFrAVO4=; b=jMuZ1aHD6ulBU8MHDM+9z6juhm+/3ekM8E9yiX5AQVH0RA3uWd8+97OY4FbjC4FIO9PfYU rMJD7+ZbZ3P3KV99Nc56Os3cIdV2xEoSfDMaGh9+MX4H6RpGSZrD8IA55Pe9VzuMM2QcsY pxPhgUZT/DXQbjo/REOtf7KcebeaSLw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-388-S86B5dHFM-aN3z9dPJHxtQ-1; Fri, 08 Dec 2023 16:03:07 -0500 X-MC-Unique: S86B5dHFM-aN3z9dPJHxtQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 166C585A58B for ; Fri, 8 Dec 2023 21:03:07 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.22.33.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id E16CF111F3C6; Fri, 8 Dec 2023 21:03:06 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [pushed] analyzer: avoid taint for (TAINTED % NON_TAINTED) Date: Fri, 8 Dec 2023 16:03:04 -0500 Message-Id: <20231208210304.2705943-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 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_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784749140492730658 X-GMAIL-MSGID: 1784749140492730658 Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to trunk as r14-6349-g0bef72539e585d. gcc/analyzer/ChangeLog: * sm-taint.cc (taint_state_machine::alt_get_inherited_state): Fix handling of TRUNC_MOD_EXPR. gcc/testsuite/ChangeLog: * c-c++-common/analyzer/taint-modulus-1.c: New test. --- gcc/analyzer/sm-taint.cc | 9 ++++++++- gcc/testsuite/c-c++-common/analyzer/taint-modulus-1.c | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/c-c++-common/analyzer/taint-modulus-1.c diff --git a/gcc/analyzer/sm-taint.cc b/gcc/analyzer/sm-taint.cc index 6b5d51c62af..597e8e55609 100644 --- a/gcc/analyzer/sm-taint.cc +++ b/gcc/analyzer/sm-taint.cc @@ -891,7 +891,6 @@ taint_state_machine::alt_get_inherited_state (const sm_state_map &map, case MULT_EXPR: case POINTER_PLUS_EXPR: case TRUNC_DIV_EXPR: - case TRUNC_MOD_EXPR: { state_t arg0_state = map.get_state (arg0, ext_state); state_t arg1_state = map.get_state (arg1, ext_state); @@ -899,6 +898,14 @@ taint_state_machine::alt_get_inherited_state (const sm_state_map &map, } break; + case TRUNC_MOD_EXPR: + { + /* The left-hand side of X % Y can be sanitized by + the operation. */ + return map.get_state (arg1, ext_state); + } + break; + case BIT_AND_EXPR: case RSHIFT_EXPR: return NULL; diff --git a/gcc/testsuite/c-c++-common/analyzer/taint-modulus-1.c b/gcc/testsuite/c-c++-common/analyzer/taint-modulus-1.c new file mode 100644 index 00000000000..ed286fa341c --- /dev/null +++ b/gcc/testsuite/c-c++-common/analyzer/taint-modulus-1.c @@ -0,0 +1,8 @@ +#define SIZE 16 +char buf[SIZE]; + +__attribute__ ((tainted_args)) +char test_sanitized_by_modulus (int val) +{ + return buf[val % SIZE]; /* { dg-bogus "use of attacker-controlled value" } */ +}