Robustify mpers.awk against invalid input

[strace] / process_vm.c

diff --git a/process_vm.c b/process_vm.c
index 9bd85a87bff3ec0e9d5fb22b44014c5c21e0d498..24934d45d80f7159991579e282c766822716afea 100644 (file)
--- a/process_vm.c
+++ b/process_vm.c
@@ -1,7 +1,6 @@
 #include "defs.h"
 
-int
-sys_process_vm_readv(struct tcb *tcp)
+SYS_FUNC(process_vm_readv)
 {
        if (entering(tcp)) {
                /* arg 1: pid */
@@ -9,7 +8,7 @@ sys_process_vm_readv(struct tcb *tcp)
        } else {
                /* arg 2: local iov */
                if (syserror(tcp)) {
-                       tprintf("%#lx", tcp->u_arg[1]);
+                       printaddr(tcp->u_arg[1]);
                } else {
                        tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
                }
@@ -17,7 +16,7 @@ sys_process_vm_readv(struct tcb *tcp)
                tprintf(", %lu, ", tcp->u_arg[2]);
                /* arg 4: remote iov */
                if (syserror(tcp)) {
-                       tprintf("%#lx", tcp->u_arg[3]);
+                       printaddr(tcp->u_arg[3]);
                } else {
                        tprint_iov(tcp, tcp->u_arg[4], tcp->u_arg[3], 0);
                }
@@ -28,27 +27,19 @@ sys_process_vm_readv(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_process_vm_writev(struct tcb *tcp)
+SYS_FUNC(process_vm_writev)
 {
-       if (entering(tcp)) {
-               /* arg 1: pid */
-               tprintf("%ld, ", tcp->u_arg[0]);
-               /* arg 2: local iov */
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else
-                       tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
-               /* arg 3: local iovcnt */
-               tprintf(", %lu, ", tcp->u_arg[2]);
-               /* arg 4: remote iov */
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[3]);
-               else
-                       tprint_iov(tcp, tcp->u_arg[4], tcp->u_arg[3], 0);
-               /* arg 5: remote iovcnt */
-               /* arg 6: flags */
-               tprintf(", %lu, %lu", tcp->u_arg[4], tcp->u_arg[5]);
-       }
-       return 0;
+       /* arg 1: pid */
+       tprintf("%ld, ", tcp->u_arg[0]);
+       /* arg 2: local iov */
+       tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
+       /* arg 3: local iovcnt */
+       tprintf(", %lu, ", tcp->u_arg[2]);
+       /* arg 4: remote iov */
+       tprint_iov(tcp, tcp->u_arg[4], tcp->u_arg[3], 0);
+       /* arg 5: remote iovcnt */
+       /* arg 6: flags */
+       tprintf(", %lu, %lu", tcp->u_arg[4], tcp->u_arg[5]);
+
+       return RVAL_DECODED;
 }