strace: terminate itself if interrupted by a signal

[strace] / tests / netlink_crypto.c

diff --git a/tests/netlink_crypto.c b/tests/netlink_crypto.c
index d15c17cf185a87937b74fbe39b67e047c356b1d3..e2a5be0c78cc0debe87deb71e595bc19f859fe40 100644 (file)
--- a/tests/netlink_crypto.c
+++ b/tests/netlink_crypto.c
@@ -1,29 +1,9 @@
 /*
  * Copyright (c) 2017 JingPiao Chen <chenjingpiao@gmail.com>
- * Copyright (c) 2017 The strace developers.
+ * Copyright (c) 2017-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"
@@ -98,8 +78,6 @@ test_nlmsg_flags(const int fd)
 static void
 test_crypto_msg_newalg(const int fd)
 {
-       void *const nlh0 = tail_alloc(NLMSG_HDRLEN);
-
        struct crypto_user_alg alg = {
                .cru_name = "abcd",
                .cru_driver_name = "efgh",
@@ -109,6 +87,8 @@ test_crypto_msg_newalg(const int fd)
                .cru_refcnt = 0xbcacfacd,
                .cru_flags = 0xefacdbad
        };
+       void *const nlh0 = midtail_alloc(NLMSG_HDRLEN, sizeof(alg));
+
        TEST_NETLINK_OBJECT_EX(fd, nlh0,
                               CRYPTO_MSG_NEWALG, NLM_F_REQUEST,
                               alg, print_quoted_memory,
@@ -149,7 +129,7 @@ test_crypto_msg_newalg(const int fd)
 static void
 test_crypto_msg_unspec(const int fd)
 {
-       void *const nlh0 = tail_alloc(NLMSG_HDRLEN);
+       void *const nlh0 = midtail_alloc(NLMSG_HDRLEN, 4);
 
        TEST_NETLINK_(fd, nlh0,
                      0xffff, "0xffff /* CRYPTO_MSG_??? */",