tests: check decoding of netlink smc_diag_msg attributes

[strace] / aio.c

diff --git a/aio.c b/aio.c
index 29562d2d6b37ed034e3747b61d750af3f1e205b8..7adb20df758a9d4ce7e88c85ae528aeef5778d00 100644 (file)
--- a/aio.c
+++ b/aio.c
@@ -3,6 +3,7 @@
  * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
  * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
  * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
+ * Copyright (c) 1999-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,13 +37,13 @@ SYS_FUNC(io_setup)
        if (entering(tcp))
                tprintf("%u, ", (unsigned int) tcp->u_arg[0]);
        else
-               printnum_ulong(tcp, tcp->u_arg[1]);
+               printnum_ptr(tcp, tcp->u_arg[1]);
        return 0;
 }
 
 SYS_FUNC(io_destroy)
 {
-       tprintf("%lu", tcp->u_arg[0]);
+       printaddr(tcp->u_arg[0]);
 
        return RVAL_DECODED;
 }
@@ -73,19 +74,22 @@ tprint_lio_opcode(unsigned cmd)
                tprints(cmds[cmd].name);
                return cmds[cmd].sub;
        }
-       tprintf("%u /* SUB_??? */", cmd);
+       tprintf("%u", cmd);
+       tprints_comment("SUB_???");
        return SUB_NONE;
 }
 
 static void
-print_common_flags(const struct iocb *cb)
+print_common_flags(struct tcb *tcp, const struct iocb *cb)
 {
 /* IOCB_FLAG_RESFD is available since v2.6.22-rc1~47 */
 #ifdef IOCB_FLAG_RESFD
-       if (cb->aio_flags & IOCB_FLAG_RESFD)
-               tprintf(", resfd=%d", cb->aio_resfd);
+       if (cb->aio_flags & IOCB_FLAG_RESFD) {
+               tprints(", resfd=");
+               printfd(tcp, cb->aio_resfd);
+       }
        if (cb->aio_flags & ~IOCB_FLAG_RESFD)
-               tprintf(", flags=%x", cb->aio_flags);
+               tprintf(", flags=%#x", cb->aio_flags);
 #endif
 }
 
@@ -98,7 +102,7 @@ iocb_is_valid(const struct iocb *cb)
 }
 
 static enum iocb_sub
-print_iocb_header(const struct iocb *cb)
+print_iocb_header(struct tcb *tcp, const struct iocb *cb)
 {
        enum iocb_sub sub;
 
@@ -113,7 +117,8 @@ print_iocb_header(const struct iocb *cb)
        if (cb->aio_reqprio)
                tprintf(", reqprio=%hd", cb->aio_reqprio);
 
-       tprintf(", fildes=%d", cb->aio_fildes);
+       tprints(", fildes=");
+       printfd(tcp, cb->aio_fildes);
 
        return sub;
 }
@@ -121,20 +126,19 @@ print_iocb_header(const struct iocb *cb)
 static void
 print_iocb(struct tcb *tcp, const struct iocb *cb)
 {
-       enum iocb_sub sub = print_iocb_header(cb);
+       enum iocb_sub sub = print_iocb_header(tcp, cb);
 
        switch (sub) {
        case SUB_COMMON:
                if (cb->aio_lio_opcode == 1 && iocb_is_valid(cb)) {
                        tprints(", str=");
-                       printstr(tcp, (unsigned long) cb->aio_buf,
-                                (unsigned long) cb->aio_nbytes);
+                       printstrn(tcp, cb->aio_buf, cb->aio_nbytes);
                } else {
                        tprintf(", buf=%#" PRIx64, (uint64_t) cb->aio_buf);
                }
                tprintf(", nbytes=%" PRIu64 ", offset=%" PRId64,
                        (uint64_t) cb->aio_nbytes, (int64_t) cb->aio_offset);
-               print_common_flags(cb);
+               print_common_flags(tcp, cb);
                break;
        case SUB_VECTOR:
                if (iocb_is_valid(cb)) {
@@ -149,7 +153,7 @@ print_iocb(struct tcb *tcp, const struct iocb *cb)
                                (uint64_t) cb->aio_nbytes);
                }
                tprintf(", offset=%" PRId64, (int64_t) cb->aio_offset);
-               print_common_flags(cb);
+               print_common_flags(tcp, cb);
                break;
        case SUB_NONE:
                break;
@@ -159,13 +163,13 @@ print_iocb(struct tcb *tcp, const struct iocb *cb)
 static bool
 print_iocbp(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
-       unsigned long addr;
+       kernel_ulong_t addr;
        struct iocb cb;
 
-       if (elem_size < sizeof(long)) {
-               addr = * (unsigned int *) elem_buf;
+       if (elem_size < sizeof(kernel_ulong_t)) {
+               addr = *(unsigned int *) elem_buf;
        } else {
-               addr = * (unsigned long *) elem_buf;
+               addr = *(kernel_ulong_t *) elem_buf;
        }
 
        tprints("{");
@@ -178,11 +182,13 @@ print_iocbp(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 
 SYS_FUNC(io_submit)
 {
-       const long nr = widen_to_long(tcp->u_arg[1]);
-       const unsigned long addr = tcp->u_arg[2];
-       unsigned long iocbp;
+       const kernel_long_t nr =
+               truncate_klong_to_current_wordsize(tcp->u_arg[1]);
+       const kernel_ulong_t addr = tcp->u_arg[2];
+       kernel_ulong_t iocbp;
 
-       tprintf("%lu, %ld, ", tcp->u_arg[0], nr);
+       printaddr(tcp->u_arg[0]);
+       tprintf(", %" PRI_kld ", ", nr);
 
        if (nr < 0)
                printaddr(addr);
@@ -209,12 +215,14 @@ print_io_event(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 SYS_FUNC(io_cancel)
 {
        if (entering(tcp)) {
-               tprintf("%lu, ", tcp->u_arg[0]);
+               printaddr(tcp->u_arg[0]);
+               tprints(", ");
+
                struct iocb cb;
 
                if (!umove_or_printaddr(tcp, tcp->u_arg[1], &cb)) {
                        tprints("{");
-                       print_iocb_header(&cb);
+                       print_iocb_header(tcp, &cb);
                        tprints("}");
                }
                tprints(", ");
@@ -230,10 +238,10 @@ SYS_FUNC(io_cancel)
 SYS_FUNC(io_getevents)
 {
        if (entering(tcp)) {
-               tprintf("%lu, %ld, %ld, ",
-                       tcp->u_arg[0],
-                       widen_to_long(tcp->u_arg[1]),
-                       widen_to_long(tcp->u_arg[2]));
+               printaddr(tcp->u_arg[0]);
+               tprintf(", %" PRI_kld ", %" PRI_kld ", ",
+                       truncate_klong_to_current_wordsize(tcp->u_arg[1]),
+                       truncate_klong_to_current_wordsize(tcp->u_arg[2]));
        } else {
                struct io_event buf;
                print_array(tcp, tcp->u_arg[3], tcp->u_rval, &buf, sizeof(buf),