From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 6E9663858C60 for ; Thu, 2 Feb 2023 14:16:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6E9663858C60 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675347393; 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=qLduuyOmHm2Uc1/IkUWXqN3nECGKYNDTftlv/4uSKSY=; b=Qw/lvKx9H6BK/2oY7tNXpsvt23+ktVJfH9sloDFyfYQ/x3LQH8/fPU+AH5Xcbh+Jo4yAgh sCxw18fQmpDH63CKVt08VjEpTvzeD91Ypn0cUa46rAIpSl3Rq9kZBw8BZm4uVQ/1F69HFL YjMWujivs36SNvzGVDzFKnQPDzUE2jE= 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-347-vXY401CUMDKEQKqdiRNv1A-1; Thu, 02 Feb 2023 09:16:32 -0500 X-MC-Unique: vXY401CUMDKEQKqdiRNv1A-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AD68B18E5387 for ; Thu, 2 Feb 2023 14:16:31 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.2.17.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 89730140EBF6; Thu, 2 Feb 2023 14:16:31 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Cc: David Malcolm Subject: [pushed] analyzer: fix -Wanalyzer-fd-type-mismatch false +ve on "listen" [PR108633] Date: Thu, 2 Feb 2023 09:16:30 -0500 Message-Id: <20230202141630.913508-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.5 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 List-Id: Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu. Integration testing shows it fixes a false positive seen on qemu, and has no other changes. Pushed to trunk as r13-5655-gd84dc419e692d4. gcc/analyzer/ChangeLog: PR analyzer/108633 * sm-fd.cc (fd_state_machine::check_for_fd_attrs): Add missing "continue". (fd_state_machine::on_listen): Don't issue phase-mismatch or type-mismatch warnings for the "invalid" state. gcc/testsuite/ChangeLog: PR analyzer/108633 * gcc.dg/analyzer/fd-pr108633.c: New test. Signed-off-by: David Malcolm --- gcc/analyzer/sm-fd.cc | 8 ++- gcc/testsuite/gcc.dg/analyzer/fd-pr108633.c | 79 +++++++++++++++++++++ 2 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/analyzer/fd-pr108633.c diff --git a/gcc/analyzer/sm-fd.cc b/gcc/analyzer/sm-fd.cc index 9225ac4acc4..494d802a1d4 100644 --- a/gcc/analyzer/sm-fd.cc +++ b/gcc/analyzer/sm-fd.cc @@ -1339,11 +1339,14 @@ fd_state_machine::check_for_fd_attrs ( if (!(is_valid_fd_p (state) || (state == m_stop))) { if (!is_constant_fd_p (state)) - sm_ctxt->warn (node, stmt, arg, - make_unique + { + sm_ctxt->warn (node, stmt, arg, + make_unique (*this, diag_arg, callee_fndecl, attr_name, arg_idx)); + continue; + } } switch (fd_attr_access_dir) @@ -1906,6 +1909,7 @@ fd_state_machine::on_listen (const call_details &cd, if (!(old_state == m_start || old_state == m_constant_fd || old_state == m_stop + || old_state == m_invalid || old_state == m_bound_stream_socket || old_state == m_bound_unknown_socket /* Assume it's OK to call "listen" more than once. */ diff --git a/gcc/testsuite/gcc.dg/analyzer/fd-pr108633.c b/gcc/testsuite/gcc.dg/analyzer/fd-pr108633.c new file mode 100644 index 00000000000..6d923b7cfc0 --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/fd-pr108633.c @@ -0,0 +1,79 @@ +/* Reduced from qemu-7.2.0's tests/qtest/libqtest.c. */ + +#define EINTR 4 + +#define g_assert_cmpint(n1, cmp, n2) \ + do { \ + gint64 __n1 = (n1), __n2 = (n2); \ + if (__n1 cmp __n2) ; else \ + g_assertion_message_cmpnum ("", __FILE__, __LINE__, __func__, \ + #n1 " " #cmp " " #n2, (long double) __n1, #cmp, (long double) __n2, 'i'); \ + } while (0) + +typedef __SIZE_TYPE__ size_t; +typedef unsigned int __socklen_t; +extern int snprintf (char *__restrict __s, size_t __maxlen, + const char *__restrict __format, ...) + __attribute__ ((__nothrow__)) __attribute__ ((__format__ (__printf__, 3, 4))); +typedef __socklen_t socklen_t; +extern int *__errno_location (void) __attribute__ ((__nothrow__ , __leaf__)) __attribute__ ((__const__)); +#define errno (*__errno_location ()) +typedef signed long gint64; +typedef char gchar; +extern +void g_assertion_message_cmpnum (const char *domain, + const char *file, + int line, + const char *func, + const char *expr, + long double arg1, + const char *cmp, + long double arg2, + char numtype); +enum __socket_type +{ + SOCK_STREAM = 1, + /* [...snip...] */ +}; + +typedef unsigned short int sa_family_t; + +typedef union { + const struct sockaddr *__restrict __sockaddr__; + /* [...snip...] */ +} __CONST_SOCKADDR_ARG __attribute__ ((__transparent_union__)); + +extern int socket (int __domain, int __type, int __protocol) + __attribute__ ((__nothrow__ , __leaf__)); +extern int bind (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len) + __attribute__ ((__nothrow__ , __leaf__)); +extern int listen (int __fd, int __n) + __attribute__ ((__nothrow__ , __leaf__)); + +struct sockaddr_un +{ + sa_family_t sun_family; + char sun_path[108]; +}; + +int qtest_socket_server(const char *socket_path) +{ + struct sockaddr_un addr; + int sock; + int ret; + + sock = socket(1, SOCK_STREAM, 0); /* { dg-message "when 'socket' fails" } */ + g_assert_cmpint(sock, !=, -1); /* this isn't marked "noreturn" */ + + addr.sun_family = 1; + snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", socket_path); + + do { + ret = bind(sock, (struct sockaddr *)&addr, sizeof(addr)); + } while (ret == -1 && errno == EINTR); + g_assert_cmpint(ret, !=, -1); + ret = listen(sock, 1); /* { dg-warning "'listen' on possibly invalid file descriptor 'sock'" } */ + g_assert_cmpint(ret, !=, -1); + + return sock; +} -- 2.26.3