Robustify mpers.awk against invalid input

[strace] / sched.c

diff --git a/sched.c b/sched.c
index d3192fa2161619878a405f6dea265e27b07a0c56..e4730469a7f6d92ff4dbf150cfde645dc8fd6fcd 100644 (file)
--- a/sched.c
+++ b/sched.c
@@ -3,9 +3,9 @@
 #include <sched.h>
 
 #include "xlat/schedulers.h"
+#include "xlat/sched_flags.h"
 
-int
-sys_sched_getscheduler(struct tcb *tcp)
+SYS_FUNC(sched_getscheduler)
 {
        if (entering(tcp)) {
                tprintf("%d", (int) tcp->u_arg[0]);
@@ -17,68 +17,102 @@ sys_sched_getscheduler(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_sched_setscheduler(struct tcb *tcp)
+SYS_FUNC(sched_setscheduler)
 {
-       if (entering(tcp)) {
-               struct sched_param p;
+       tprintf("%d, ", (int) tcp->u_arg[0]);
+       printxval(schedulers, tcp->u_arg[1], "SCHED_???");
+       tprints(", ");
+       printnum_int(tcp, tcp->u_arg[2], "%d");
+
+       return RVAL_DECODED;
+}
+
+SYS_FUNC(sched_getparam)
+{
+       if (entering(tcp))
                tprintf("%d, ", (int) tcp->u_arg[0]);
-               printxval(schedulers, tcp->u_arg[1], "SCHED_???");
-               if (umove(tcp, tcp->u_arg[2], &p) < 0)
-                       tprintf(", %#lx", tcp->u_arg[2]);
-               else
-                       tprintf(", { %d }", p.sched_priority);
-       }
+       else
+               printnum_int(tcp, tcp->u_arg[1], "%d");
        return 0;
 }
 
-int
-sys_sched_getparam(struct tcb *tcp)
+SYS_FUNC(sched_setparam)
+{
+       tprintf("%d, ", (int) tcp->u_arg[0]);
+       printnum_int(tcp, tcp->u_arg[1], "%d");
+
+       return RVAL_DECODED;
+}
+
+SYS_FUNC(sched_get_priority_min)
+{
+       printxval(schedulers, tcp->u_arg[0], "SCHED_???");
+
+       return RVAL_DECODED;
+}
+
+SYS_FUNC(sched_rr_get_interval)
 {
        if (entering(tcp)) {
                tprintf("%d, ", (int) tcp->u_arg[0]);
        } else {
-               struct sched_param p;
-               if (umove(tcp, tcp->u_arg[1], &p) < 0)
-                       tprintf("%#lx", tcp->u_arg[1]);
+               if (syserror(tcp))
+                       printaddr(tcp->u_arg[1]);
                else
-                       tprintf("{ %d }", p.sched_priority);
+                       print_timespec(tcp, tcp->u_arg[1]);
        }
        return 0;
 }
 
-int
-sys_sched_setparam(struct tcb *tcp)
+static void
+print_sched_attr(struct tcb *tcp, const long addr, unsigned int size)
 {
-       if (entering(tcp)) {
-               struct sched_param p;
-               if (umove(tcp, tcp->u_arg[1], &p) < 0)
-                       tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]);
-               else
-                       tprintf("%d, { %d }", (int) tcp->u_arg[0], p.sched_priority);
-       }
-       return 0;
+       struct {
+               uint32_t size;
+               uint32_t sched_policy;
+               uint64_t sched_flags;
+               uint32_t sched_nice;
+               uint32_t sched_priority;
+               uint64_t sched_runtime;
+               uint64_t sched_deadline;
+               uint64_t sched_period;
+       } attr = {};
+
+       if (size > sizeof(attr))
+               size = sizeof(attr);
+       if (umoven_or_printaddr(tcp, addr, size, &attr))
+               return;
+
+       tprintf("{size=%u, sched_policy=", attr.size);
+       printxval(schedulers, attr.sched_policy, "SCHED_???");
+       tprints(", sched_flags=");
+       printflags(sched_flags, attr.sched_flags, "SCHED_FLAG_???");
+       tprintf(", sched_nice=%d", attr.sched_nice);
+       tprintf(", sched_priority=%u", attr.sched_priority);
+       tprintf(", sched_runtime=%" PRIu64, attr.sched_runtime);
+       tprintf(", sched_deadline=%" PRIu64, attr.sched_deadline);
+       tprintf(", sched_period=%" PRIu64 "}", attr.sched_period);
 }
 
-int
-sys_sched_get_priority_min(struct tcb *tcp)
+SYS_FUNC(sched_setattr)
 {
-       if (entering(tcp)) {
-               printxval(schedulers, tcp->u_arg[0], "SCHED_???");
-       }
-       return 0;
+       tprintf("%d, ", (int) tcp->u_arg[0]);
+       print_sched_attr(tcp, tcp->u_arg[1], 0x100);
+       tprintf(", %u", (unsigned int) tcp->u_arg[2]);
+
+       return RVAL_DECODED;
 }
 
-int
-sys_sched_rr_get_interval(struct tcb *tcp)
+SYS_FUNC(sched_getattr)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", (long) (pid_t) tcp->u_arg[0]);
+               tprintf("%d, ", (int) tcp->u_arg[0]);
        } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else
-                       print_timespec(tcp, tcp->u_arg[1]);
+               print_sched_attr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+               tprintf(", %u, %u",
+                       (unsigned int) tcp->u_arg[2],
+                       (unsigned int) tcp->u_arg[3]);
        }
+
        return 0;
 }