tests: check decoding of prctl PR_GET_TID_ADDRESS operation

[strace] / poll.c

diff --git a/poll.c b/poll.c
index 9dcaae22491b3cc14f81c84a926a75a395735d57..f2a2381489eb1667c2b0d8f68b5124b294321133 100644 (file)
--- a/poll.c
+++ b/poll.c
@@ -31,76 +31,46 @@
 
 #include "xlat/pollflags.h"
 
-static void
-print_pollfd(struct tcb *tcp, const struct pollfd *fds)
+static bool
+print_pollfd(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
+       const struct pollfd *fds = elem_buf;
+
        tprints("{fd=");
        printfd(tcp, fds->fd);
        if (fds->fd >= 0) {
                tprints(", events=");
-               printflags(pollflags, fds->events, "POLL???");
+               printflags(pollflags, (unsigned short) fds->events, "POLL???");
        }
        tprints("}");
+
+       return true;
 }
 
-static int
+static void
 decode_poll_entering(struct tcb *tcp)
 {
-       struct pollfd fds;
+       const kernel_ulong_t addr = tcp->u_arg[0];
        const unsigned int nfds = tcp->u_arg[1];
-       const unsigned long size = sizeof(fds) * nfds;
-       const unsigned long start = tcp->u_arg[0];
-       const unsigned long end = start + size;
-       unsigned long cur, abbrev_end;
-
-       if (!verbose(tcp) || !start || !nfds ||
-           size / sizeof(fds) != nfds || end < start) {
-               printaddr(start);
-               tprintf(", %u, ", nfds);
-               return 0;
-       }
-
-       if (abbrev(tcp)) {
-               abbrev_end = start + max_strlen * sizeof(fds);
-               if (abbrev_end < start)
-                       abbrev_end = end;
-       } else {
-               abbrev_end = end;
-       }
-
-       if (start >= abbrev_end || umove(tcp, start, &fds) < 0) {
-               printaddr(start);
-               tprintf(", %u, ", nfds);
-               return 0;
-       }
-
-       tprints("[");
-       print_pollfd(tcp, &fds);
-       for (cur = start + sizeof(fds); cur < end; cur += sizeof(fds)) {
-               tprints(", ");
-               if (cur >= abbrev_end) {
-                       tprints("...");
-                       break;
-               }
-               if (umove_or_printaddr(tcp, cur, &fds))
-                       break;
-               print_pollfd(tcp, &fds);
-
-       }
-       tprintf("], %u, ", nfds);
+       struct pollfd fds;
 
-       return 0;
+       print_array(tcp, addr, nfds, &fds, sizeof(fds),
+                   umoven_or_printaddr, print_pollfd, 0);
+       tprintf(", %u, ", nfds);
 }
 
 static int
-decode_poll_exiting(struct tcb *tcp, const long pts)
+decode_poll_exiting(struct tcb *const tcp, const kernel_ulong_t pts)
 {
        struct pollfd fds;
        const unsigned int nfds = tcp->u_arg[1];
        const unsigned long size = sizeof(fds) * nfds;
-       const unsigned long start = tcp->u_arg[0];
-       const unsigned long end = start + size;
-       unsigned long cur, abbrev_end;
+       const kernel_ulong_t start = tcp->u_arg[0];
+       const kernel_ulong_t end = start + size;
+       kernel_ulong_t cur;
+       const unsigned int max_printed =
+               abbrev(tcp) ? max_strlen : -1U;
+       unsigned int printed;
 
        static char outstr[1024];
        char *outptr;
@@ -116,23 +86,16 @@ decode_poll_exiting(struct tcb *tcp, const long pts)
        if (!verbose(tcp) || !start || !nfds ||
            size / sizeof(fds) != nfds || end < start)
                return 0;
-       if (abbrev(tcp)) {
-               abbrev_end = start + max_strlen * sizeof(fds);
-               if (abbrev_end < start)
-                       abbrev_end = end;
-       } else {
-               abbrev_end = end;
-       }
 
        outptr = outstr;
 
-       for (cur = start; cur < end; cur += sizeof(fds)) {
+       for (printed = 0, cur = start; cur < end; cur += sizeof(fds)) {
                if (umove(tcp, cur, &fds) < 0) {
                        if (outptr == outstr)
                                *outptr++ = '[';
                        else
                                outptr = stpcpy(outptr, ", ");
-                       outptr += sprintf(outptr, "%#lx", cur);
+                       outptr += sprintf(outptr, "%#" PRI_klx, cur);
                        break;
                }
                if (!fds.revents)
@@ -141,7 +104,7 @@ decode_poll_exiting(struct tcb *tcp, const long pts)
                        *outptr++ = '[';
                else
                        outptr = stpcpy(outptr, ", ");
-               if (cur >= abbrev_end) {
+               if (printed >= max_printed) {
                        outptr = stpcpy(outptr, "...");
                        break;
                }
@@ -150,7 +113,8 @@ decode_poll_exiting(struct tcb *tcp, const long pts)
                char fdstr[sizeof(fmt) + sizeof(int) * 3];
                sprintf(fdstr, fmt, fds.fd);
 
-               const char *flagstr = sprintflags("", pollflags, fds.revents);
+               const char *flagstr = sprintflags("", pollflags,
+                                                 (unsigned short) fds.revents);
 
                if (outptr + strlen(fdstr) + strlen(flagstr) + 1 >=
                    end_outstr - (2 + 2 * sizeof(long) + sizeof(", ], ..."))) {
@@ -160,6 +124,7 @@ decode_poll_exiting(struct tcb *tcp, const long pts)
                outptr = stpcpy(outptr, fdstr);
                outptr = stpcpy(outptr, flagstr);
                *outptr++ = '}';
+               ++printed;
        }
 
        if (outptr != outstr)
@@ -188,16 +153,17 @@ decode_poll_exiting(struct tcb *tcp, const long pts)
 SYS_FUNC(poll)
 {
        if (entering(tcp)) {
-               int rc = decode_poll_entering(tcp);
+               decode_poll_entering(tcp);
+               int timeout = tcp->u_arg[2];
 
 #ifdef INFTIM
-               if (INFTIM == (int) tcp->u_arg[2])
+               if (INFTIM == timeout)
                        tprints("INFTIM");
                else
 #endif
-                       tprintf("%d", (int) tcp->u_arg[2]);
+                       tprintf("%d", timeout);
 
-               return rc;
+               return 0;
        } else {
                return decode_poll_exiting(tcp, 0);
        }
@@ -206,15 +172,15 @@ SYS_FUNC(poll)
 SYS_FUNC(ppoll)
 {
        if (entering(tcp)) {
-               int rc = decode_poll_entering(tcp);
+               decode_poll_entering(tcp);
 
                print_timespec(tcp, tcp->u_arg[2]);
                tprints(", ");
-               /* NB: kernel requires arg[4] == NSIG / 8 */
+               /* NB: kernel requires arg[4] == NSIG_BYTES */
                print_sigset_addr_len(tcp, tcp->u_arg[3], tcp->u_arg[4]);
-               tprintf(", %lu", tcp->u_arg[4]);
+               tprintf(", %" PRI_klu, tcp->u_arg[4]);
 
-               return rc;
+               return 0;
        } else {
                return decode_poll_exiting(tcp, tcp->u_arg[2]);
        }