]> granicus.if.org Git - strace/blobdiff - io.c
x32: fix decoding of 3rd argument of preadv* and pwritev* syscalls
[strace] / io.c
diff --git a/io.c b/io.c
index b483c493864bdfd39384d5a47f30a03534a55416..713a1ce4f8b708688d2fa706b36bf6901be25ec7 100644 (file)
--- a/io.c
+++ b/io.c
 
 #include "defs.h"
 #include <fcntl.h>
-#if HAVE_SYS_UIO_H
-# include <sys/uio.h>
-#endif
+#include <sys/uio.h>
 
-int
-sys_read(struct tcb *tcp)
+SYS_FUNC(read)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
        } else {
                if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
+                       printaddr(tcp->u_arg[1]);
                else
                        printstr(tcp, tcp->u_arg[1], tcp->u_rval);
                tprintf(", %lu", tcp->u_arg[2]);
@@ -50,344 +47,284 @@ sys_read(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_write(struct tcb *tcp)
+SYS_FUNC(write)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu", tcp->u_arg[2]);
-       }
-       return 0;
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+       tprintf(", %lu", tcp->u_arg[2]);
+
+       return RVAL_DECODED;
 }
 
-#if HAVE_SYS_UIO_H
-void
-tprint_iov(struct tcb *tcp, unsigned long len, unsigned long addr, int decode_iov)
+struct print_iovec_config {
+       enum iov_decode decode_iov;
+       unsigned long data_size;
+};
+
+static bool
+print_iovec(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
-#if SUPPORTED_PERSONALITIES > 1
-       union {
-               struct { u_int32_t base; u_int32_t len; } iov32;
-               struct { u_int64_t base; u_int64_t len; } iov64;
-       } iov;
-#define sizeof_iov \
-  (personality_wordsize[current_personality] == 4 \
-   ? sizeof(iov.iov32) : sizeof(iov.iov64))
-#define iov_iov_base \
-  (personality_wordsize[current_personality] == 4 \
-   ? (u_int64_t) iov.iov32.base : iov.iov64.base)
-#define iov_iov_len \
-  (personality_wordsize[current_personality] == 4 \
-   ? (u_int64_t) iov.iov32.len : iov.iov64.len)
-#else
-       struct iovec iov;
-#define sizeof_iov sizeof(iov)
-#define iov_iov_base iov.iov_base
-#define iov_iov_len iov.iov_len
-#endif
-       unsigned long size, cur, end, abbrev_end;
-       int failed = 0;
+       const unsigned long *iov;
+       unsigned long iov_buf[2], len;
+       struct print_iovec_config *c = data;
 
-       if (!len) {
-               tprints("[]");
-               return;
-       }
-       size = len * sizeof_iov;
-       end = addr + size;
-       if (!verbose(tcp) || size / sizeof_iov != len || end < addr) {
-               tprintf("%#lx", addr);
-               return;
-       }
-       if (abbrev(tcp)) {
-               abbrev_end = addr + max_strlen * sizeof_iov;
-               if (abbrev_end < addr)
-                       abbrev_end = end;
+        if (elem_size < sizeof(iov_buf)) {
+               iov_buf[0] = ((unsigned int *) elem_buf)[0];
+               iov_buf[1] = ((unsigned int *) elem_buf)[1];
+               iov = iov_buf;
        } else {
-               abbrev_end = end;
+               iov = elem_buf;
        }
-       tprints("[");
-       for (cur = addr; cur < end; cur += sizeof_iov) {
-               if (cur > addr)
-                       tprints(", ");
-               if (cur >= abbrev_end) {
-                       tprints("...");
+
+       tprints("{iov_base=");
+
+       len = iov[1];
+
+       switch (c->decode_iov) {
+               case IOV_DECODE_STR:
+                       if (len > c->data_size)
+                               len = c->data_size;
+                       if (c->data_size != -1UL)
+                               c->data_size -= len;
+                       printstr(tcp, iov[0], len);
                        break;
-               }
-               if (umoven(tcp, cur, sizeof_iov, (char *) &iov) < 0) {
-                       tprints("?");
-                       failed = 1;
+               case IOV_DECODE_NETLINK:
+                       if (len > c->data_size)
+                               len = c->data_size;
+                       if (c->data_size != -1UL)
+                               c->data_size -= len;
+                       decode_netlink(tcp, iov[0], iov[1]);
+                       break;
+               default:
+                       printaddr(iov[0]);
                        break;
-               }
-               tprints("{");
-               if (decode_iov)
-                       printstr(tcp, (long) iov_iov_base, iov_iov_len);
-               else
-                       tprintf("%#lx", (long) iov_iov_base);
-               tprintf(", %lu}", (unsigned long)iov_iov_len);
        }
-       tprints("]");
-       if (failed)
-               tprintf(" %#lx", addr);
-#undef sizeof_iov
-#undef iov_iov_base
-#undef iov_iov_len
+
+       tprintf(", iov_len=%lu}", iov[1]);
+
+       return true;
 }
 
-int
-sys_readv(struct tcb *tcp)
+/*
+ * data_size limits the cumulative size of printed data.
+ * Example: recvmsg returing a short read.
+ */
+void
+tprint_iov_upto(struct tcb *tcp, unsigned long len, unsigned long addr,
+               enum iov_decode decode_iov, unsigned long data_size)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-       } else {
-               if (syserror(tcp)) {
-                       tprintf("%#lx, %lu",
-                                       tcp->u_arg[1], tcp->u_arg[2]);
-                       return 0;
-               }
-               tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
-               tprintf(", %lu", tcp->u_arg[2]);
-       }
-       return 0;
+       unsigned long iov[2];
+       struct print_iovec_config config =
+               { .decode_iov = decode_iov, .data_size = data_size };
+
+       print_array(tcp, addr, len, iov, current_wordsize * 2,
+                   umoven_or_printaddr_ignore_syserror, print_iovec, &config);
 }
 
-int
-sys_writev(struct tcb *tcp)
+void
+tprint_iov(struct tcb *tcp, unsigned long len, unsigned long addr,
+          enum iov_decode decode_iov)
+{
+       tprint_iov_upto(tcp, len, addr, decode_iov, -1UL);
+}
+
+SYS_FUNC(readv)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
-               tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
+       } else {
+               tprint_iov_upto(tcp, tcp->u_arg[2], tcp->u_arg[1],
+                               syserror(tcp) ? IOV_DECODE_ADDR :
+                               IOV_DECODE_STR, tcp->u_rval);
                tprintf(", %lu", tcp->u_arg[2]);
        }
        return 0;
 }
-#endif
 
-/* The SH4 ABI does allow long longs in odd-numbered registers, but
-   does not allow them to be split between registers and memory - and
-   there are only four argument registers for normal functions.  As a
-   result pread takes an extra padding argument before the offset.  This
-   was changed late in the 2.4 series (around 2.4.20).  */
-#if defined(SH)
-#define PREAD_OFFSET_ARG 4
-#else
-#define PREAD_OFFSET_ARG 3
-#endif
+SYS_FUNC(writev)
+{
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], IOV_DECODE_STR);
+       tprintf(", %lu", tcp->u_arg[2]);
+
+       return RVAL_DECODED;
+}
 
-int
-sys_pread(struct tcb *tcp)
+SYS_FUNC(pread)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
        } else {
                if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
+                       printaddr(tcp->u_arg[1]);
                else
                        printstr(tcp, tcp->u_arg[1], tcp->u_rval);
                tprintf(", %lu, ", tcp->u_arg[2]);
-               printllval(tcp, "%llu", PREAD_OFFSET_ARG);
+               printllval(tcp, "%lld", 3);
        }
        return 0;
 }
 
-int
-sys_pwrite(struct tcb *tcp)
+SYS_FUNC(pwrite)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu, ", tcp->u_arg[2]);
-               printllval(tcp, "%llu", PREAD_OFFSET_ARG);
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+       tprintf(", %lu, ", tcp->u_arg[2]);
+       printllval(tcp, "%lld", 3);
+
+       return RVAL_DECODED;
+}
+
+static void
+print_lld_from_low_high_val(struct tcb *tcp, int arg)
+{
+#if SIZEOF_LONG > 4 && SIZEOF_LONG == SIZEOF_LONG_LONG
+# ifndef current_klongsize
+       if (current_klongsize < SIZEOF_LONG) {
+               tprintf("%ld", (tcp->u_arg[arg + 1] << current_wordsize * 8)
+                              | tcp->u_arg[arg]);
+       } else
+# endif /* !current_klongsize */
+       {
+               tprintf("%ld", tcp->u_arg[arg]);
        }
-       return 0;
+#elif SIZEOF_LONG > 4
+# error Unsupported configuration: SIZEOF_LONG > 4 && SIZEOF_LONG_LONG > SIZEOF_LONG
+#elif HAVE_STRUCT_TCB_EXT_ARG
+# ifndef current_klongsize
+       if (current_klongsize < SIZEOF_LONG_LONG) {
+               tprintf("%lld",
+                       (zero_extend_signed_to_ull(tcp->u_arg[arg + 1]) << sizeof(long) * 8)
+                       | zero_extend_signed_to_ull(tcp->u_arg[arg]));
+       } else
+# endif /* !current_klongsize */
+       {
+               tprintf("%lld", tcp->ext_arg[arg]);
+       }
+#else /* SIZEOF_LONG_LONG > SIZEOF_LONG && !HAVE_STRUCT_TCB_EXT_ARG */
+       tprintf("%lld",
+               (zero_extend_signed_to_ull(tcp->u_arg[arg + 1]) << sizeof(long) * 8)
+               | zero_extend_signed_to_ull(tcp->u_arg[arg]));
+#endif
 }
 
-#if HAVE_SYS_UIO_H
-int
-sys_preadv(struct tcb *tcp)
+#include "xlat/rwf_flags.h"
+
+static int
+do_preadv(struct tcb *tcp, const int flags_arg)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
        } else {
-               if (syserror(tcp)) {
-                       tprintf("%#lx, %lu", tcp->u_arg[1], tcp->u_arg[2]);
-                       return 0;
+               unsigned long len = widen_to_ulong(tcp->u_arg[2]);
+
+               tprint_iov_upto(tcp, len, tcp->u_arg[1],
+                               syserror(tcp) ? IOV_DECODE_ADDR :
+                               IOV_DECODE_STR, tcp->u_rval);
+               tprintf(", %lu, ", len);
+               print_lld_from_low_high_val(tcp, 3);
+               if (flags_arg >= 0) {
+                       tprints(", ");
+                       printflags(rwf_flags, tcp->u_arg[flags_arg], "RWF_???");
                }
-               tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
-               tprintf(", %lu, ", tcp->u_arg[2]);
-               printllval(tcp, "%llu", PREAD_OFFSET_ARG);
        }
        return 0;
 }
 
-int
-sys_pwritev(struct tcb *tcp)
+SYS_FUNC(preadv)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
-               tprintf(", %lu, ", tcp->u_arg[2]);
-               printllval(tcp, "%llu", PREAD_OFFSET_ARG);
-       }
-       return 0;
+       return do_preadv(tcp, -1);
 }
-#endif /* HAVE_SYS_UIO_H */
 
-int
-sys_sendfile(struct tcb *tcp)
+SYS_FUNC(preadv2)
 {
-       if (entering(tcp)) {
-               off_t offset;
+       return do_preadv(tcp, 5);
+}
 
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printfd(tcp, tcp->u_arg[1]);
+static int
+do_pwritev(struct tcb *tcp, const int flags_arg)
+{
+       unsigned long len = widen_to_ulong(tcp->u_arg[2]);
+
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       tprint_iov(tcp, len, tcp->u_arg[1], IOV_DECODE_STR);
+       tprintf(", %lu, ", len);
+       print_lld_from_low_high_val(tcp, 3);
+       if (flags_arg >= 0) {
                tprints(", ");
-               if (!tcp->u_arg[2])
-                       tprints("NULL");
-               else if (umove(tcp, tcp->u_arg[2], &offset) < 0)
-                       tprintf("%#lx", tcp->u_arg[2]);
-               else
-#ifdef HAVE_LONG_LONG_OFF_T
-                       tprintf("[%llu]", offset);
-#else
-                       tprintf("[%lu]", offset);
-#endif
-               tprintf(", %lu", tcp->u_arg[3]);
+               printflags(rwf_flags, tcp->u_arg[flags_arg], "RWF_???");
        }
-       return 0;
+
+       return RVAL_DECODED;
 }
 
-static void
-print_loff_t(struct tcb *tcp, long addr)
+SYS_FUNC(pwritev)
 {
-       loff_t offset;
-
-       if (!addr)
-               tprints("NULL");
-       else if (umove(tcp, addr, &offset) < 0)
-               tprintf("%#lx", addr);
-       else
-               tprintf("[%llu]", (unsigned long long int) offset);
+       return do_pwritev(tcp, -1);
 }
 
-int
-sys_sendfile64(struct tcb *tcp)
+SYS_FUNC(pwritev2)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printfd(tcp, tcp->u_arg[1]);
-               tprints(", ");
-               print_loff_t(tcp, tcp->u_arg[2]);
-               tprintf(", %lu", tcp->u_arg[3]);
-       }
-       return 0;
+       return do_pwritev(tcp, 5);
 }
 
-static const struct xlat splice_flags[] = {
-#ifdef SPLICE_F_MOVE
-       { SPLICE_F_MOVE,     "SPLICE_F_MOVE"     },
-#endif
-#ifdef SPLICE_F_NONBLOCK
-       { SPLICE_F_NONBLOCK, "SPLICE_F_NONBLOCK" },
-#endif
-#ifdef SPLICE_F_MORE
-       { SPLICE_F_MORE,     "SPLICE_F_MORE"     },
-#endif
-#ifdef SPLICE_F_GIFT
-       { SPLICE_F_GIFT,     "SPLICE_F_GIFT"     },
-#endif
-       { 0,                 NULL                },
-};
+#include "xlat/splice_flags.h"
 
-int
-sys_tee(struct tcb *tcp)
+SYS_FUNC(tee)
 {
-       if (entering(tcp)) {
-               /* int fd_in */
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               /* int fd_out */
-               printfd(tcp, tcp->u_arg[1]);
-               tprints(", ");
-               /* size_t len */
-               tprintf("%lu, ", tcp->u_arg[2]);
-               /* unsigned int flags */
-               printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
-       }
-       return 0;
-}
+       /* int fd_in */
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       /* int fd_out */
+       printfd(tcp, tcp->u_arg[1]);
+       tprints(", ");
+       /* size_t len */
+       tprintf("%lu, ", tcp->u_arg[2]);
+       /* unsigned int flags */
+       printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
 
-int
-sys_splice(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               /* int fd_in */
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               /* loff_t *off_in */
-               print_loff_t(tcp, tcp->u_arg[1]);
-               tprints(", ");
-               /* int fd_out */
-               printfd(tcp, tcp->u_arg[2]);
-               tprints(", ");
-               /* loff_t *off_out */
-               print_loff_t(tcp, tcp->u_arg[3]);
-               tprints(", ");
-               /* size_t len */
-               tprintf("%lu, ", tcp->u_arg[4]);
-               /* unsigned int flags */
-               printflags(splice_flags, tcp->u_arg[5], "SPLICE_F_???");
-       }
-       return 0;
+       return RVAL_DECODED;
 }
 
-int
-sys_vmsplice(struct tcb *tcp)
+SYS_FUNC(splice)
 {
-       if (entering(tcp)) {
-               /* int fd */
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               /* const struct iovec *iov, unsigned long nr_segs */
-               tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
-               tprintf(", %lu, ", tcp->u_arg[2]);
-               /* unsigned int flags */
-               printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
-       }
-       return 0;
+       /* int fd_in */
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       /* loff_t *off_in */
+       printnum_int64(tcp, tcp->u_arg[1], "%" PRId64);
+       tprints(", ");
+       /* int fd_out */
+       printfd(tcp, tcp->u_arg[2]);
+       tprints(", ");
+       /* loff_t *off_out */
+       printnum_int64(tcp, tcp->u_arg[3], "%" PRId64);
+       tprints(", ");
+       /* size_t len */
+       tprintf("%lu, ", tcp->u_arg[4]);
+       /* unsigned int flags */
+       printflags(splice_flags, tcp->u_arg[5], "SPLICE_F_???");
+
+       return RVAL_DECODED;
 }
 
-int
-sys_ioctl(struct tcb *tcp)
+SYS_FUNC(vmsplice)
 {
-       const struct ioctlent *iop;
+       /* int fd */
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       /* const struct iovec *iov, unsigned long nr_segs */
+       tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], IOV_DECODE_STR);
+       tprintf(", %lu, ", tcp->u_arg[2]);
+       /* unsigned int flags */
+       printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
 
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               iop = ioctl_lookup(tcp->u_arg[1]);
-               if (iop) {
-                       tprints(iop->symbol);
-                       while ((iop = ioctl_next_match(iop)))
-                               tprintf(" or %s", iop->symbol);
-               } else
-                       tprintf("%#lx", tcp->u_arg[1]);
-               ioctl_decode(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-       }
-       else {
-               int ret = ioctl_decode(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               if (!ret)
-                       tprintf(", %#lx", tcp->u_arg[2]);
-               else
-                       return ret - 1;
-       }
-       return 0;
+       return RVAL_DECODED;
 }