]> granicus.if.org Git - strace/blobdiff - scsi.c
tests: check decoding of accept4 syscall
[strace] / scsi.c
diff --git a/scsi.c b/scsi.c
index 73c97eaca0ebed20e61f8b6b5ac97ab7b748c100..dc51dd571cd6af16da0953cd9229255110a4c212 100644 (file)
--- a/scsi.c
+++ b/scsi.c
@@ -30,7 +30,7 @@
 
 #ifdef HAVE_SCSI_SG_H
 
-# include <sys/ioctl.h>
+# include <linux/ioctl.h>
 # include <scsi/sg.h>
 
 # include "xlat/sg_io_dxfer_direction.h"
 #  include "xlat/bsg_subprotocol.h"
 # endif
 
-static void
-print_sg_io_buffer(struct tcb *tcp, unsigned long addr, const unsigned int len)
+static bool
+print_uchar(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
-       unsigned char *buf = NULL;
-       unsigned int allocated, i;
-
-       tprints("[");
-       if (len == 0)
-               goto out;
-       allocated = (len > max_strlen) ? max_strlen : len;
-       if ((buf = malloc(allocated)) == NULL ||
-           umoven(tcp, addr, allocated, buf) < 0) {
-               tprintf("%#lx", addr);
-               goto out;
-       }
-       tprintf("%02x", buf[0]);
-       for (i = 1; i < allocated; ++i)
-               tprintf(", %02x", buf[i]);
-       if (allocated != len)
-               tprints(", ...");
-out:
-       free(buf);
-       tprints("]");
+       tprintf("%02x", (unsigned int) (* (unsigned char *) elem_buf));
+
+       return true;
 }
 
 static void
-print_sg_io_v3_req(struct tcb *tcp, long arg)
+print_sg_io_buffer(struct tcb *tcp, const unsigned long addr, const unsigned int len)
+{
+       unsigned char buf;
+
+       print_array(tcp, addr, len, &buf, sizeof(buf),
+                   umoven_or_printaddr, print_uchar, 0);
+}
+
+static int
+print_sg_io_v3_req(struct tcb *tcp, const long arg)
 {
        struct sg_io_hdr sg_io;
 
        if (umove(tcp, arg, &sg_io) < 0) {
-               tprintf(", %#lx", arg);
-               return;
+               tprints("???}");
+               return RVAL_DECODED | 1;
        }
 
-       tprints(", ");
        printxval(sg_io_dxfer_direction, sg_io.dxfer_direction,
                  "SG_DXFER_???");
        tprintf(", cmd[%u]=", sg_io.cmd_len);
@@ -93,21 +84,23 @@ print_sg_io_v3_req(struct tcb *tcp, long arg)
                tprintf(", data[%u]=", sg_io.dxfer_len);
                if (sg_io.iovec_count)
                        tprint_iov_upto(tcp, sg_io.iovec_count,
-                                       (unsigned long) sg_io.dxferp, 1,
+                                       (unsigned long) sg_io.dxferp,
+                                       IOV_DECODE_STR,
                                        sg_io.dxfer_len);
                else
                        print_sg_io_buffer(tcp, (unsigned long) sg_io.dxferp,
                                           sg_io.dxfer_len);
        }
+       return 1;
 }
 
 static void
-print_sg_io_v3_res(struct tcb *tcp, long arg)
+print_sg_io_v3_res(struct tcb *tcp, const long arg)
 {
        struct sg_io_hdr sg_io;
 
        if (umove(tcp, arg, &sg_io) < 0) {
-               tprintf(", %#lx", arg);
+               tprints(", ???");
                return;
        }
 
@@ -120,7 +113,8 @@ print_sg_io_v3_res(struct tcb *tcp, long arg)
                tprintf(", data[%u]=", din_len);
                if (sg_io.iovec_count)
                        tprint_iov_upto(tcp, sg_io.iovec_count,
-                                       (unsigned long) sg_io.dxferp, 1,
+                                       (unsigned long) sg_io.dxferp,
+                                       IOV_DECODE_STR,
                                        din_len);
                else
                        print_sg_io_buffer(tcp, (unsigned long) sg_io.dxferp,
@@ -139,23 +133,22 @@ print_sg_io_v3_res(struct tcb *tcp, long arg)
 
 #ifdef HAVE_LINUX_BSG_H
 
-static void
-print_sg_io_v4_req(struct tcb *tcp, long arg)
+static int
+print_sg_io_v4_req(struct tcb *tcp, const long arg)
 {
        struct sg_io_v4 sg_io;
 
        if (umove(tcp, arg, &sg_io) < 0) {
-               tprintf(", %#lx", arg);
-               return;
+               tprints("???}");
+               return RVAL_DECODED | 1;
        }
 
-       tprints(", ");
        printxval(bsg_protocol, sg_io.protocol, "BSG_PROTOCOL_???");
        tprints(", ");
        printxval(bsg_subprotocol, sg_io.subprotocol, "BSG_SUB_PROTOCOL_???");
        tprintf(", request[%u]=", sg_io.request_len);
        print_sg_io_buffer(tcp, sg_io.request, sg_io.request_len);
-       tprintf(", request_tag=%llu", (unsigned long long) sg_io.request_tag);
+       tprintf(", request_tag=%" PRI__u64, sg_io.request_tag);
        tprintf(", request_attr=%u", sg_io.request_attr);
        tprintf(", request_priority=%u", sg_io.request_priority);
        tprintf(", request_extra=%u", sg_io.request_extra);
@@ -167,24 +160,25 @@ print_sg_io_v4_req(struct tcb *tcp, long arg)
        tprintf(", din_xfer_len=%u", sg_io.din_xfer_len);
        tprintf(", timeout=%u", sg_io.timeout);
        tprintf(", flags=%u", sg_io.flags);
-       tprintf(", usr_ptr=%llu", (unsigned long long) sg_io.usr_ptr);
+       tprintf(", usr_ptr=%" PRI__u64, sg_io.usr_ptr);
        tprintf(", spare_in=%u", sg_io.spare_in);
        tprintf(", dout[%u]=", sg_io.dout_xfer_len);
        if (sg_io.dout_iovec_count)
                tprint_iov_upto(tcp, sg_io.dout_iovec_count, sg_io.dout_xferp,
-                               1, sg_io.dout_xfer_len);
+                               IOV_DECODE_STR, sg_io.dout_xfer_len);
        else
                print_sg_io_buffer(tcp, sg_io.dout_xferp, sg_io.dout_xfer_len);
+       return 1;
 }
 
 static void
-print_sg_io_v4_res(struct tcb *tcp, long arg)
+print_sg_io_v4_res(struct tcb *tcp, const long arg)
 {
        struct sg_io_v4 sg_io;
        uint32_t din_len;
 
        if (umove(tcp, arg, &sg_io) < 0) {
-               tprintf(", %#lx", arg);
+               tprints(", ???");
                return;
        }
 
@@ -196,7 +190,7 @@ print_sg_io_v4_res(struct tcb *tcp, long arg)
        tprintf(", din[%u]=", din_len);
        if (sg_io.din_iovec_count)
                tprint_iov_upto(tcp, sg_io.din_iovec_count, sg_io.din_xferp,
-                               1, din_len);
+                               IOV_DECODE_STR, din_len);
        else
                print_sg_io_buffer(tcp, sg_io.din_xferp, din_len);
        tprintf(", driver_status=%u", sg_io.driver_status);
@@ -208,84 +202,82 @@ print_sg_io_v4_res(struct tcb *tcp, long arg)
        tprintf(", response_len=%u", sg_io.response_len);
        tprintf(", din_resid=%u", sg_io.din_resid);
        tprintf(", dout_resid=%u", sg_io.dout_resid);
-       tprintf(", generated_tag=%llu", (unsigned long long) sg_io.generated_tag);
+       tprintf(", generated_tag=%" PRI__u64, sg_io.generated_tag);
        tprintf(", spare_out=%u", sg_io.spare_out);
 }
 
 #else /* !HAVE_LINUX_BSG_H */
 
-static void
-print_sg_io_v4_req(struct tcb *tcp, long arg)
+static int
+print_sg_io_v4_req(struct tcb *tcp, const long arg)
 {
-       tprintf(", %#lx", arg);
+       tprints("...}");
+       return RVAL_DECODED | 1;
 }
 
 static void
-print_sg_io_v4_res(struct tcb *tcp, long arg)
+print_sg_io_v4_res(struct tcb *tcp, const long arg)
 {
 }
 
 #endif
 
-static void
-print_sg_io_req(struct tcb *tcp, uint32_t iid, long arg)
+static int
+print_sg_io_req(struct tcb *tcp, uint32_t iid, const long arg)
 {
-       tprintf("{'%c'", iid);
+       tprintf("{'%c'", iid);
 
        switch (iid) {
        case 'S':
-               print_sg_io_v3_req(tcp, arg);
-               break;
+               return print_sg_io_v3_req(tcp, arg);
        case 'Q':
-               print_sg_io_v4_req(tcp, arg);
-               break;
+               return print_sg_io_v4_req(tcp, arg);
        default:
-               tprints(", ...");
+               tprints("...}");
+               return RVAL_DECODED | 1;
        }
 
 }
 
 static void
-print_sg_io_res(struct tcb *tcp, uint32_t iid, long arg)
+print_sg_io_res(struct tcb *tcp, uint32_t iid, const long arg)
 {
-       if (!syserror(tcp)) {
-               switch (iid) {
-               case 'S':
-                       print_sg_io_v3_res(tcp, arg);
-                       break;
-               case 'Q':
-                       print_sg_io_v4_res(tcp, arg);
-                       break;
-               }
+       switch (iid) {
+       case 'S':
+               print_sg_io_v3_res(tcp, arg);
+               break;
+       case 'Q':
+               print_sg_io_v4_res(tcp, arg);
+               break;
        }
-
-       tprintf("}");
 }
 
 int
-scsi_ioctl(struct tcb *tcp, const unsigned int code, long arg)
+scsi_ioctl(struct tcb *tcp, const unsigned int code, const long arg)
 {
        uint32_t iid;
 
-       switch (code) {
-       case SG_IO:
-               if (entering(tcp)) {
-                       tprints(", ");
+       if (SG_IO != code)
+               return RVAL_DECODED;
+
+       if (entering(tcp)) {
+               tprints(", ");
+               if (!arg || umove(tcp, arg, &iid) < 0) {
+                       printaddr(arg);
+                       return RVAL_DECODED | 1;
+               } else {
+                       return print_sg_io_req(tcp, iid, arg);
+               }
+       } else {
+               if (!syserror(tcp)) {
                        if (umove(tcp, arg, &iid) < 0)
-                               tprintf("%#lx", arg);
+                               tprints(", ???");
                        else
-                               print_sg_io_req(tcp, iid, arg);
-               } else {
-                       if (umove(tcp, arg, &iid) >= 0)
                                print_sg_io_res(tcp, iid, arg);
                }
-               break;
-       default:
-               if (entering(tcp))
-                       tprintf(", %#lx", arg);
-               break;
+               tprintf("}");
+               return RVAL_DECODED | 1;
        }
-       return 1;
 }
 
 #endif /* HAVE_SCSI_SG_H */