strace: terminate itself if interrupted by a signal

[strace] / tests / netlink_inet_diag.c

diff --git a/tests/netlink_inet_diag.c b/tests/netlink_inet_diag.c
index ffd3591ad57513efff16d7502042c030330f3f80..e3ccc05c0827882b1605884d20d4a27b38236e8e 100644 (file)
--- a/tests/netlink_inet_diag.c
+++ b/tests/netlink_inet_diag.c
@@ -1,75 +1,101 @@
-#include <assert.h>
+/*
+ * This file is part of inet-yy strace test.
+ *
+ * Copyright (c) 2014-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2018 The strace developers.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "tests.h"
+#include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include <netinet/in.h>
-#include <linux/netlink.h>
+#include "netlink.h"
 #include <linux/sock_diag.h>
 #include <linux/inet_diag.h>
 
-static int
+static void
 send_query(const int fd, const int family, const int proto)
 {
-       struct sockaddr_nl nladdr;
+       struct sockaddr_nl nladdr = {
+               .nl_family = AF_NETLINK
+       };
        struct {
                struct nlmsghdr nlh;
                struct inet_diag_req_v2 idr;
-       } req;
+       } req = {
+               .nlh = {
+                       .nlmsg_len = sizeof(req),
+                       .nlmsg_type = SOCK_DIAG_BY_FAMILY,
+                       .nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST
+               },
+               .idr = {
+                       .sdiag_family = family,
+                       .sdiag_protocol = proto,
+                       .idiag_states = -1
+               }
+       };
        struct iovec iov = {
                .iov_base = &req,
                .iov_len = sizeof(req)
        };
        struct msghdr msg = {
-               .msg_name = (void*)&nladdr,
+               .msg_name = (void *) &nladdr,
                .msg_namelen = sizeof(nladdr),
                .msg_iov = &iov,
                .msg_iovlen = 1
        };
 
-       memset(&nladdr, 0, sizeof(nladdr));
-       nladdr.nl_family = AF_NETLINK;
-
-       memset(&req, 0, sizeof(req));
-       req.nlh.nlmsg_len = sizeof(req);
-       req.nlh.nlmsg_type = SOCK_DIAG_BY_FAMILY;
-       req.nlh.nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST;
-       req.idr.sdiag_family = family;
-       req.idr.sdiag_protocol = proto;
-       req.idr.idiag_states = -1;
-
-       return sendmsg(fd, &msg, 0) > 0;
+       if (sendmsg(fd, &msg, 0) <= 0)
+               perror_msg_and_skip("sendmsg");
 }
 
-static int
+static void
 check_responses(const int fd)
 {
-       static char buf[8192];
-       struct sockaddr_nl nladdr;
+       static union {
+               struct nlmsghdr hdr;
+               long buf[8192 / sizeof(long)];
+       } hdr_buf;
+
+       struct sockaddr_nl nladdr = {
+               .nl_family = AF_NETLINK
+       };
        struct iovec iov = {
-               .iov_base = buf,
-               .iov_len = sizeof(buf)
+               .iov_base = hdr_buf.buf,
+               .iov_len = sizeof(hdr_buf.buf)
        };
-
-       memset(&nladdr, 0, sizeof(nladdr));
-       nladdr.nl_family = AF_NETLINK;
-
        struct msghdr msg = {
-               .msg_name = (void*)&nladdr,
+               .msg_name = (void *) &nladdr,
                .msg_namelen = sizeof(nladdr),
                .msg_iov = &iov,
-               .msg_iovlen = 1,
-               .msg_control = NULL,
-               .msg_controllen = 0,
-               .msg_flags = 0
+               .msg_iovlen = 1
        };
 
        ssize_t ret = recvmsg(fd, &msg, 0);
        if (ret <= 0)
-               return 0;
+               perror_msg_and_skip("recvmsg");
+
+       struct nlmsghdr *h = &hdr_buf.hdr;
+       if (!is_nlmsg_ok(h, ret))
+               error_msg_and_skip("!is_nlmsg_ok");
+       if (h->nlmsg_type == NLMSG_ERROR) {
+               const struct nlmsgerr *err = NLMSG_DATA(h);
+               if (h->nlmsg_len < NLMSG_LENGTH(sizeof(*err)))
+                       error_msg_and_skip("NLMSG_ERROR");
+               errno = -err->error;
+               perror_msg_and_skip("NLMSG_ERROR");
+       }
+       if (h->nlmsg_type != SOCK_DIAG_BY_FAMILY)
+               error_msg_and_skip("unexpected nlmsg_type %u",
+                                  (unsigned) h->nlmsg_type);
 
-       struct nlmsghdr *h = (struct nlmsghdr*)buf;
-       return (NLMSG_OK(h, ret) &&
-               h->nlmsg_type != NLMSG_ERROR &&
-               h->nlmsg_type != NLMSG_DONE) ? 1 : 0;
+       const struct inet_diag_msg *diag = NLMSG_DATA(h);
+       if (h->nlmsg_len < NLMSG_LENGTH(sizeof(*diag)))
+               error_msg_and_skip("short response");
 }
 
 int main(void)
@@ -84,13 +110,16 @@ int main(void)
        close(0);
        close(1);
 
-       assert(socket(PF_INET, SOCK_STREAM, 0) == 0);
-       assert(bind(0, (struct sockaddr *) &addr, len) == 0);
-       assert(listen(0, 5) == 0);
-
+       if (socket(AF_INET, SOCK_STREAM, 0))
+               perror_msg_and_skip("socket AF_INET");
+       if (bind(0, (struct sockaddr *) &addr, len))
+               perror_msg_and_skip("bind");
+       if (listen(0, 5))
+               perror_msg_and_skip("listen");
        if (socket(AF_NETLINK, SOCK_RAW, NETLINK_INET_DIAG) != 1)
-               return 77;
+               perror_msg_and_skip("socket AF_NETLINK");
 
-       return (send_query(1, AF_INET, IPPROTO_TCP) &&
-               check_responses(1)) ? 0 : 77;
+       send_query(1, AF_INET, IPPROTO_TCP);
+       check_responses(1);
+       return 0;
 }