Introduce struct_rt_sigframe type

[strace] / loop.c

diff --git a/loop.c b/loop.c
index cccc014316c2aad819d0cb198b2ae09cf953dd7a..f19ad928c0ca31518452ad45276aba7b3dc2d697 100644 (file)
--- a/loop.c
+++ b/loop.c
@@ -29,13 +29,20 @@
 #include <linux/ioctl.h>
 #include <linux/loop.h>
 
+typedef struct loop_info struct_loop_info;
+
+#include DEF_MPERS_TYPE(struct_loop_info)
+
+#include MPERS_DEFS
+
+#include "xlat/loop_cmds.h"
 #include "xlat/loop_flags_options.h"
 #include "xlat/loop_crypt_type_options.h"
 
 static void
-decode_loop_info(struct tcb *const tcp, const kernel_ureg_t addr)
+decode_loop_info(struct tcb *const tcp, const kernel_ulong_t addr)
 {
-       struct loop_info info;
+       struct_loop_info info;
 
        tprints(", ");
        if (umove_or_printaddr(tcp, addr, &info))
@@ -44,10 +51,11 @@ decode_loop_info(struct tcb *const tcp, const kernel_ureg_t addr)
        tprintf("{lo_number=%d", info.lo_number);
 
        if (!abbrev(tcp)) {
-               tprintf(", lo_device=%#lx, lo_inode=%lu, lo_rdevice=%#lx",
-                       (unsigned long) info.lo_device,
-                       info.lo_inode,
-                       (unsigned long) info.lo_rdevice);
+               tprints(", lo_device=");
+               print_dev_t(info.lo_device);
+               tprintf(", lo_inode=%" PRI_klu, (kernel_ulong_t) info.lo_inode);
+               tprints(", lo_rdevice=");
+               print_dev_t(info.lo_rdevice);
        }
 
        tprintf(", lo_offset=%#x", info.lo_offset);
@@ -56,7 +64,12 @@ decode_loop_info(struct tcb *const tcp, const kernel_ureg_t addr)
                tprints(", lo_encrypt_type=");
                printxval(loop_crypt_type_options, info.lo_encrypt_type,
                        "LO_CRYPT_???");
-               tprintf(", lo_encrypt_key_size=%d", info.lo_encrypt_key_size);
+               /*
+                * It is converted to unsigned before use in kernel, see
+                * loop_info64_from_old in drivers/block/loop.c
+                */
+               tprintf(", lo_encrypt_key_size=%" PRIu32,
+                       (uint32_t) info.lo_encrypt_key_size);
        }
 
        tprints(", lo_flags=");
@@ -69,13 +82,15 @@ decode_loop_info(struct tcb *const tcp, const kernel_ureg_t addr)
        if (!abbrev(tcp) || info.lo_encrypt_type != LO_CRYPT_NONE) {
                tprints(", lo_encrypt_key=");
                print_quoted_string((void *) info.lo_encrypt_key,
-                                   LO_KEY_SIZE, 0);
+                                   MIN((uint32_t) info.lo_encrypt_key_size,
+                                   LO_KEY_SIZE), 0);
        }
 
        if (!abbrev(tcp))
-               tprintf(", lo_init=[%#lx, %#lx]"
-                       ", reserved=[%#x, %#x, %#x, %#x]}",
-                       info.lo_init[0], info.lo_init[1],
+               tprintf(", lo_init=[%#" PRI_klx ", %#" PRI_klx "]"
+                       ", reserved=[%#hhx, %#hhx, %#hhx, %#hhx]}",
+                       (kernel_ulong_t) info.lo_init[0],
+                       (kernel_ulong_t) info.lo_init[1],
                        info.reserved[0], info.reserved[1],
                        info.reserved[2], info.reserved[3]);
        else
@@ -83,7 +98,7 @@ decode_loop_info(struct tcb *const tcp, const kernel_ureg_t addr)
 }
 
 static void
-decode_loop_info64(struct tcb *const tcp, const kernel_ureg_t addr)
+decode_loop_info64(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct loop_info64 info64;
 
@@ -92,12 +107,13 @@ decode_loop_info64(struct tcb *const tcp, const kernel_ureg_t addr)
                return;
 
        if (!abbrev(tcp)) {
-               tprintf("{lo_device=%" PRIu64 ", lo_inode=%" PRIu64
-                       ", lo_rdevice=%" PRIu64 ", lo_offset=%#" PRIx64
-                       ", lo_sizelimit=%" PRIu64 ", lo_number=%" PRIu32,
-                       (uint64_t) info64.lo_device,
-                       (uint64_t) info64.lo_inode,
-                       (uint64_t) info64.lo_rdevice,
+               tprints("{lo_device=");
+               print_dev_t(info64.lo_device);
+               tprintf(", lo_inode=%" PRIu64, (uint64_t) info64.lo_inode);
+               tprints(", lo_rdevice=");
+               print_dev_t(info64.lo_rdevice);
+               tprintf(", lo_offset=%#" PRIx64 ", lo_sizelimit=%" PRIu64
+                       ", lo_number=%" PRIu32,
                        (uint64_t) info64.lo_offset,
                        (uint64_t) info64.lo_sizelimit,
                        (uint32_t) info64.lo_number);
@@ -128,7 +144,8 @@ decode_loop_info64(struct tcb *const tcp, const kernel_ureg_t addr)
                                    LO_NAME_SIZE, QUOTE_0_TERMINATED);
                tprints(", lo_encrypt_key=");
                print_quoted_string((void *) info64.lo_encrypt_key,
-                                   LO_KEY_SIZE, 0);
+                                   MIN(info64.lo_encrypt_key_size,
+                                   LO_KEY_SIZE), 0);
        }
 
        if (!abbrev(tcp))
@@ -139,13 +156,10 @@ decode_loop_info64(struct tcb *const tcp, const kernel_ureg_t addr)
                tprints(", ...}");
 }
 
-int
-loop_ioctl(struct tcb *const tcp, const unsigned int code,
-          const kernel_ureg_t arg)
+MPERS_PRINTER_DECL(int, loop_ioctl,
+                  struct tcb *tcp, const unsigned int code,
+                  const kernel_ulong_t arg)
 {
-       if (!verbose(tcp))
-               return RVAL_DECODED;
-
        switch (code) {
        case LOOP_GET_STATUS:
                if (entering(tcp))
@@ -164,13 +178,9 @@ loop_ioctl(struct tcb *const tcp, const unsigned int code,
                break;
 
        case LOOP_CLR_FD:
-#ifdef LOOP_SET_CAPACITY
        case LOOP_SET_CAPACITY:
-#endif
-#ifdef LOOP_CTL_GET_FREE
        /* newer loop-control stuff */
        case LOOP_CTL_GET_FREE:
-#endif
                /* Takes no arguments */
                break;
 
@@ -180,19 +190,15 @@ loop_ioctl(struct tcb *const tcp, const unsigned int code,
                printfd(tcp, arg);
                break;
 
-#ifdef LOOP_CTL_ADD
        /* newer loop-control stuff */
        case LOOP_CTL_ADD:
        case LOOP_CTL_REMOVE:
                tprintf(", %d", (int) arg);
                break;
-#endif
 
-#ifdef LOOP_SET_DIRECT_IO
        case LOOP_SET_DIRECT_IO:
-               tprintf(", %" PRI_kru, arg);
+               tprintf(", %" PRI_klu, arg);
                break;
-#endif
 
        default:
                return RVAL_DECODED;