From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2209) id 5527F3858C2D; Thu, 2 Feb 2023 14:13:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5527F3858C2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675347203; bh=DO4vQeSTEUUEoeHG71jbrhE3My36TCw5Mo2hs1Se8gs=; h=From:To:Subject:Date:From; b=Z7im4+kWMiJiDCr1eYgcS1dAUSYt2l9nwSjA4yiLwzvP6xkOI3NbFw9+rjuNOs7Ff tQHsHo0Ni1C+gpV3oyad/N2HHxOnsunsvZIyEvBslWsCrqfX6S4UCUFWDyEQaXFIML SNlXx11kdVX0tHHwo1TIFO4rfPHTrJ2B3Py3/VDQ= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: David Malcolm To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5655] analyzer: fix -Wanalyzer-fd-type-mismatch false +ve on "listen" [PR108633] X-Act-Checkin: gcc X-Git-Author: David Malcolm X-Git-Refname: refs/heads/master X-Git-Oldrev: 598e10cf415f0a53eab2b1e63980531c60d673b7 X-Git-Newrev: d84dc419e692d42c3b1e0c82e972c8a6f4c71389 Message-Id: <20230202141323.5527F3858C2D@sourceware.org> Date: Thu, 2 Feb 2023 14:13:23 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d84dc419e692d42c3b1e0c82e972c8a6f4c71389 commit r13-5655-gd84dc419e692d42c3b1e0c82e972c8a6f4c71389 Author: David Malcolm Date: Thu Feb 2 09:11:36 2023 -0500 analyzer: fix -Wanalyzer-fd-type-mismatch false +ve on "listen" [PR108633] 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 Diff: --- gcc/analyzer/sm-fd.cc | 8 ++- gcc/testsuite/gcc.dg/analyzer/fd-pr108633.c | 79 +++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 2 deletions(-) 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; +}