io: handle data_size of -1 as unlimited data in print_iovec

[strace] / msghdr.c

diff --git a/msghdr.c b/msghdr.c
index d93ab82e9abbd9e25a4f210dd50c548ae0b74c9e..63f5171457e50d744f66b470ab65af029e357139 100644 (file)
--- a/msghdr.c
+++ b/msghdr.c
@@ -31,6 +31,7 @@
 
 #include "defs.h"
 #include "msghdr.h"
+#include <limits.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
@@ -229,10 +230,6 @@ print_cmsg_type_data(struct tcb *tcp, const int cmsg_level, const int cmsg_type,
        }
 }
 
-#ifndef UIO_MAXIOV
-# define UIO_MAXIOV 1024
-#endif
-
 static unsigned int
 get_optmem_max(void)
 {
@@ -241,7 +238,7 @@ get_optmem_max(void)
        if (!optmem_max) {
                if (read_int_from_file("/proc/sys/net/core/optmem_max",
                                       &optmem_max) || optmem_max <= 0) {
-                       optmem_max = sizeof(long long) * (2 * UIO_MAXIOV + 512);
+                       optmem_max = sizeof(long long) * (2 * IOV_MAX + 512);
                } else {
                        optmem_max = (optmem_max + sizeof(long long) - 1)
                                     & ~(sizeof(long long) - 1);
@@ -332,22 +329,27 @@ decode_msg_control(struct tcb *tcp, unsigned long addr,
        free(buf);
 }
 
-static void
-print_msghdr(struct tcb *tcp, struct msghdr *msg, unsigned long data_size)
+void
+print_struct_msghdr(struct tcb *tcp, const struct msghdr *msg,
+                   const int *const p_user_msg_namelen,
+                   const unsigned long data_size)
 {
-       int family;
-       enum iov_decode decode;
+       const int msg_namelen =
+               p_user_msg_namelen && (int) msg->msg_namelen > *p_user_msg_namelen
+               ? *p_user_msg_namelen : (int) msg->msg_namelen;
 
        tprints("{msg_name=");
-       family = decode_sockaddr(tcp, (long)msg->msg_name, msg->msg_namelen);
-       tprintf(", msg_namelen=%d", msg->msg_namelen);
+       const int family =
+               decode_sockaddr(tcp, (long) msg->msg_name, msg_namelen);
+       const enum iov_decode decode =
+               (family == AF_NETLINK) ? IOV_DECODE_NETLINK : IOV_DECODE_STR;
 
-       tprints(", msg_iov=");
+       tprints(", msg_namelen=");
+       if (p_user_msg_namelen && *p_user_msg_namelen != (int) msg->msg_namelen)
+               tprintf("%d->", *p_user_msg_namelen);
+       tprintf("%d", msg->msg_namelen);
 
-       if (family == AF_NETLINK)
-               decode = IOV_DECODE_NETLINK;
-       else
-               decode = IOV_DECODE_STR;
+       tprints(", msg_iov=");
 
        tprint_iov_upto(tcp, (unsigned long) msg->msg_iovlen,
                        (unsigned long) msg->msg_iov, decode, data_size);
@@ -362,13 +364,27 @@ print_msghdr(struct tcb *tcp, struct msghdr *msg, unsigned long data_size)
        tprints("}");
 }
 
-void
-decode_msghdr(struct tcb *tcp, long addr, unsigned long data_size)
+static bool
+fetch_msghdr_namelen(struct tcb *tcp, const long addr, int *const p_msg_namelen)
+{
+       struct msghdr msg;
+
+       if (addr && verbose(tcp) && fetch_struct_msghdr(tcp, addr, &msg)) {
+               *p_msg_namelen = msg.msg_namelen;
+               return true;
+       } else {
+               return false;
+       }
+}
+
+static void
+decode_msghdr(struct tcb *tcp, const int *const p_user_msg_namelen,
+             const long addr, const unsigned long data_size)
 {
        struct msghdr msg;
 
        if (addr && verbose(tcp) && fetch_struct_msghdr(tcp, addr, &msg))
-               print_msghdr(tcp, &msg, data_size);
+               print_struct_msghdr(tcp, &msg, p_user_msg_namelen, data_size);
        else
                printaddr(addr);
 }
@@ -382,58 +398,43 @@ dumpiov_in_msghdr(struct tcb *tcp, long addr, unsigned long data_size)
                dumpiov_upto(tcp, msg.msg_iovlen, (long)msg.msg_iov, data_size);
 }
 
-static int
-decode_mmsghdr(struct tcb *tcp, long addr, bool use_msg_len)
+SYS_FUNC(sendmsg)
 {
-       struct mmsghdr mmsg;
-       int fetched = fetch_struct_mmsghdr(tcp, addr, &mmsg);
-
-       if (fetched) {
-               tprints("{msg_hdr=");
-               print_msghdr(tcp, &mmsg.msg_hdr, use_msg_len ? mmsg.msg_len : -1UL);
-               tprintf(", msg_len=%u}", mmsg.msg_len);
-       } else {
-               printaddr(addr);
-       }
-
-       return fetched;
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       decode_msghdr(tcp, 0, tcp->u_arg[1], (unsigned long) -1L);
+       /* flags */
+       tprints(", ");
+       printflags(msg_flags, tcp->u_arg[2], "MSG_???");
+
+       return RVAL_DECODED;
 }
 
-void
-decode_mmsgvec(struct tcb *tcp, unsigned long addr, unsigned int len,
-              bool use_msg_len)
+SYS_FUNC(recvmsg)
 {
-       if (syserror(tcp)) {
-               printaddr(addr);
-       } else {
-               unsigned int i, fetched;
-
-               tprints("[");
-               for (i = 0; i < len; ++i, addr += fetched) {
-                       if (i)
-                               tprints(", ");
-                       fetched = decode_mmsghdr(tcp, addr, use_msg_len);
-                       if (!fetched)
-                               break;
+       int msg_namelen;
+
+       if (entering(tcp)) {
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               if (fetch_msghdr_namelen(tcp, tcp->u_arg[1], &msg_namelen)) {
+                       set_tcb_priv_ulong(tcp, msg_namelen);
+                       return 0;
                }
-               tprints("]");
+               printaddr(tcp->u_arg[1]);
+       } else {
+               msg_namelen = get_tcb_priv_ulong(tcp);
+
+               if (syserror(tcp))
+                       tprintf("{msg_namelen=%d}", msg_namelen);
+               else
+                       decode_msghdr(tcp, &msg_namelen, tcp->u_arg[1],
+                                     tcp->u_rval);
        }
-}
 
-void
-dumpiov_in_mmsghdr(struct tcb *tcp, long addr)
-{
-       unsigned int len = tcp->u_rval;
-       unsigned int i, fetched;
-       struct mmsghdr mmsg;
+       /* flags */
+       tprints(", ");
+       printflags(msg_flags, tcp->u_arg[2], "MSG_???");
 
-       for (i = 0; i < len; ++i, addr += fetched) {
-               fetched = fetch_struct_mmsghdr(tcp, addr, &mmsg);
-               if (!fetched)
-                       break;
-               tprintf(" = %lu buffers in vector %u\n",
-                       (unsigned long)mmsg.msg_hdr.msg_iovlen, i);
-               dumpiov_upto(tcp, mmsg.msg_hdr.msg_iovlen,
-                       (long)mmsg.msg_hdr.msg_iov, mmsg.msg_len);
-       }
+       return RVAL_DECODED;
 }