strace: terminate itself if interrupted by a signal

[strace] / tests / netlink_unix_diag.c

diff --git a/tests/netlink_unix_diag.c b/tests/netlink_unix_diag.c
index 12033e0fc7f07a91ce05008d8bb9ffd0854becab..62e3ef1f418ffd29ab602bd2e4dba891fe74f894 100644 (file)
--- a/tests/netlink_unix_diag.c
+++ b/tests/netlink_unix_diag.c
@@ -2,29 +2,10 @@
  * This file is part of net-yy-unix strace test.
  *
  * Copyright (c) 2014-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2018 The strace developers.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "tests.h"
@@ -36,16 +17,12 @@
 #include <unistd.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <linux/netlink.h>
+#include "netlink.h"
 #include <linux/sock_diag.h>
 #include <linux/unix_diag.h>
 
-#if !defined NETLINK_SOCK_DIAG && defined NETLINK_INET_DIAG
-# define NETLINK_SOCK_DIAG NETLINK_INET_DIAG
-#endif
-
 static void
-send_query(const int fd, const int family, const int proto)
+send_query(const int fd)
 {
        struct sockaddr_nl nladdr = {
                .nl_family = AF_NETLINK
@@ -57,11 +34,10 @@ send_query(const int fd, const int family, const int proto)
                .nlh = {
                        .nlmsg_len = sizeof(req),
                        .nlmsg_type = SOCK_DIAG_BY_FAMILY,
-                       .nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST
+                       .nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP
                },
                .udr = {
-                       .sdiag_family = family,
-                       .sdiag_protocol = proto,
+                       .sdiag_family = AF_UNIX,
                        .udiag_states = -1,
                        .udiag_show = UDIAG_SHOW_NAME | UDIAG_SHOW_PEER
                }
@@ -84,13 +60,17 @@ send_query(const int fd, const int family, const int proto)
 static void
 check_responses(const int fd)
 {
-       static char buf[8192];
+       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)
        };
        struct msghdr msg = {
                .msg_name = (void *) &nladdr,
@@ -103,9 +83,9 @@ check_responses(const int fd)
        if (ret <= 0)
                perror_msg_and_skip("recvmsg");
 
-       struct nlmsghdr *h = (struct nlmsghdr *) buf;
-       if (!NLMSG_OK(h, ret))
-               error_msg_and_skip("!NLMSG_OK");
+       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)))
@@ -135,8 +115,8 @@ int main(void)
        close(1);
 
        (void) unlink(SUN_PATH);
-       if (socket(PF_LOCAL, SOCK_STREAM, 0))
-               perror_msg_and_skip("socket PF_LOCAL");
+       if (socket(AF_UNIX, SOCK_STREAM, 0))
+               perror_msg_and_skip("socket AF_UNIX");
        if (bind(0, (struct sockaddr *) &addr, len))
                perror_msg_and_skip("bind");
        if (listen(0, 5))
@@ -147,7 +127,7 @@ int main(void)
        if (socket(AF_NETLINK, SOCK_RAW, NETLINK_SOCK_DIAG) != 1)
                perror_msg_and_skip("socket AF_NETLINK");
 
-       send_query(1, AF_UNIX, 0);
+       send_query(1);
        check_responses(1);
        return 0;
 }