From patchwork Wed Oct 26 21:23:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 11444 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp489939wru; Wed, 26 Oct 2022 14:23:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5wQ0eJxFN9chMFqscs4uk8rFnb8fIrF7wU6VbPFg1LduK7258Wl3dhjBiHeA+WkLjKQUg7 X-Received: by 2002:a17:907:7f8e:b0:7aa:7598:126d with SMTP id qk14-20020a1709077f8e00b007aa7598126dmr13872614ejc.289.1666819435446; Wed, 26 Oct 2022 14:23:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666819435; cv=none; d=google.com; s=arc-20160816; b=lgJz3y61DOAm0nTSx4/0Jwm99RzogPXE4zWlDSS/jBT+KQhIgXuS1MgmkD4JTGNXIf O+j8uTXjCHp5FVwWq5vGbSFD3zDQ0T9AHT+kDgNg3H/wxeclf4GrM7M/VrUKN1RxlHmL MFgIK73X/HhijRm84nuJW+baZZUrJYoiLzDLYFuFGnr/xJOYrFjcGeQsx6PtxW/B8B2h ecoDCBV/mGPV7WQbzbMSD01SMe7UpJ+E8dCuwsalvnCusLgpNjLJo6sWG34y+ep0eNIL qT9dpvSisRJl5wyLzjg5rC1s2D1VzbUxBcE7S2kchrWwqiADLsi86alniBrislJgV2VU hgIA== 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:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=r6jGFiSQg563q5sSzwI+teqGznkDiTa68bp+eb4OW40=; b=IEjhy3cYJpzDwWsDGA0pqQoDIV7TrWi8ZDef7cn5EeXAZle0nw9glJPD2wFh8SBFxH ciZz6bE90Z2MxlgIuxx1q0Gl/n+UdWORaMZrKa0Xoi+lz+kQh27e+fiWrIalOn0tqmy3 FGcixL3jV6LIn2E6ugG+8SB9yzmHAQbDOWydKe63Vxo5emTClYyd22gC8OiqJlQpp896 z9dJgKCnNMDVE32vQEyhFOP6v0Mm+XZL2wjFuQsGiiBPHaiNUGA4+s/gNJ+yUl8ze0Kf KROD0m/PvOYzeHVNcKVpWm8HJHMEndT2Q25YioiUtlx1US8dtj8ysFl5HHcf7+Af8/6K vBfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="eL8VcC/i"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id w4-20020a056402268400b0045d03c18e5asi7938963edd.19.2022.10.26.14.23.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 14:23:55 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="eL8VcC/i"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 41752382A2C8 for ; Wed, 26 Oct 2022 21:23:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 41752382A2C8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666819434; bh=r6jGFiSQg563q5sSzwI+teqGznkDiTa68bp+eb4OW40=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=eL8VcC/iXa0j60/2aHN6u0EUs3lXnyIIgTdqaUKLCZ7TzIiypeZzLxdeFkgf4h7qb +VVQ110iIVvyOIIBYv7Bxz/JbqkUm5TJpiINiFWPqkHF9i/lgCwDxF4alaa5zuhuAU rc85p8bb51PkCny0ukN0St3joZEVb4/zYjjJMqAY= 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 10B9D382C16F for ; Wed, 26 Oct 2022 21:23:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 10B9D382C16F 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-660-m_l3qFzKMTeoMd2h_AQ2zQ-1; Wed, 26 Oct 2022 17:23:06 -0400 X-MC-Unique: m_l3qFzKMTeoMd2h_AQ2zQ-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 482D4800B30; Wed, 26 Oct 2022 21:23:06 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.2.17.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17CAD40C6FA0; Wed, 26 Oct 2022 21:23:06 +0000 (UTC) To: gcc-patches@gcc.gnu.org Cc: Immad Mir , David Malcolm Subject: [committed] analyzer: fixes to file-descriptor handling Date: Wed, 26 Oct 2022 17:23:00 -0400 Message-Id: <20221026212300.1867175-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.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_NONE, RCVD_IN_MSPIKE_H2, 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747786856218502468?= X-GMAIL-MSGID: =?utf-8?q?1747786856218502468?= Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Pushed to trunk as r13-3515-g57bbf3a403bb1e. gcc/analyzer/ChangeLog: * sm-fd.cc (fd_state_machine::on_open): Transition to "unchecked" when the mode is symbolic, rather than just on integer constants. (fd_state_machine::check_for_open_fd): Don't complain about unchecked values in the start state. gcc/testsuite/ChangeLog: * gcc.dg/analyzer/fd-3.c (test_5): Expect "opened here" message even when flags are symbolic. (test_read_from_symbolic_fd): New. (test_write_to_symbolic_fd): New. Signed-off-by: David Malcolm --- gcc/analyzer/sm-fd.cc | 34 ++++++++++++++-------------- gcc/testsuite/gcc.dg/analyzer/fd-3.c | 18 ++++++++++++--- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/gcc/analyzer/sm-fd.cc b/gcc/analyzer/sm-fd.cc index 8a4c2088c74..ae846cd6ec8 100644 --- a/gcc/analyzer/sm-fd.cc +++ b/gcc/analyzer/sm-fd.cc @@ -940,25 +940,25 @@ fd_state_machine::on_open (sm_context *sm_ctxt, const supernode *node, if (lhs) { tree arg = gimple_call_arg (call, 1); + enum access_mode mode = READ_WRITE; if (TREE_CODE (arg) == INTEGER_CST) { int flag = TREE_INT_CST_LOW (arg); - enum access_mode mode = get_access_mode_from_flag (flag); - - switch (mode) - { - case READ_ONLY: - sm_ctxt->on_transition (node, stmt, lhs, m_start, - m_unchecked_read_only); - break; - case WRITE_ONLY: - sm_ctxt->on_transition (node, stmt, lhs, m_start, - m_unchecked_write_only); - break; - default: - sm_ctxt->on_transition (node, stmt, lhs, m_start, - m_unchecked_read_write); - } + mode = get_access_mode_from_flag (flag); + } + switch (mode) + { + case READ_ONLY: + sm_ctxt->on_transition (node, stmt, lhs, m_start, + m_unchecked_read_only); + break; + case WRITE_ONLY: + sm_ctxt->on_transition (node, stmt, lhs, m_start, + m_unchecked_write_only); + break; + default: + sm_ctxt->on_transition (node, stmt, lhs, m_start, + m_unchecked_read_write); } } else @@ -1096,7 +1096,7 @@ fd_state_machine::check_for_open_fd ( else { - if (!(is_valid_fd_p (state) || (state == m_stop))) + if (!(is_valid_fd_p (state) || state == m_start || state == m_stop)) { if (!is_constant_fd_p (state)) sm_ctxt->warn ( diff --git a/gcc/testsuite/gcc.dg/analyzer/fd-3.c b/gcc/testsuite/gcc.dg/analyzer/fd-3.c index 55e84e3634a..8e71b14f71b 100644 --- a/gcc/testsuite/gcc.dg/analyzer/fd-3.c +++ b/gcc/testsuite/gcc.dg/analyzer/fd-3.c @@ -50,9 +50,9 @@ test_5 (char *path, void *buf) int flags = O_RDONLY; if (some_condition()) flags |= O_NOATIME; - int fd = open (path, flags); + int fd = open (path, flags); /* { dg-message "\\(1\\) opened here" } */ read (fd, buf, 1); /* { dg-warning "'read' on possibly invalid file descriptor 'fd'" } */ - /* { dg-message "\\(1\\) 'fd' could be invalid" "" { target *-*-* } .-1 } */ + /* { dg-message "\\(2\\) 'fd' could be invalid" "" { target *-*-* } .-1 } */ close (fd); } @@ -82,4 +82,16 @@ test_7 (char *path, void *buf) } close(fd); -} \ No newline at end of file +} + +void +test_read_from_symbolic_fd (int fd, void *buf) +{ + read (fd, buf, 1); +} + +void +test_write_to_symbolic_fd (int fd, void *buf) +{ + write (fd, buf, 1); +}