Robustify mpers.awk against invalid input

[strace] / clone.c

diff --git a/clone.c b/clone.c
index a0a70964c13c96bfb11edbbb2e63090ec67b4a08..63304c22133ec693034658917888c88035c75a68 100644 (file)
--- a/clone.c
+++ b/clone.c
@@ -1,32 +1,10 @@
 #include "defs.h"
 
-/* defines copied from linux/sched.h since we can't include that
- * ourselves (it conflicts with *lots* of libc includes)
- */
-#define CSIGNAL         0x000000ff      /* signal mask to be sent at exit */
-#define CLONE_VM        0x00000100      /* set if VM shared between processes */
-#define CLONE_FS        0x00000200      /* set if fs info shared between processes */
-#define CLONE_FILES     0x00000400      /* set if open files shared between processes */
-#define CLONE_SIGHAND   0x00000800      /* set if signal handlers shared */
-#define CLONE_IDLETASK  0x00001000      /* kernel-only flag */
-#define CLONE_PTRACE    0x00002000      /* set if we want to let tracing continue on the child too */
-#define CLONE_VFORK     0x00004000      /* set if the parent wants the child to wake it up on mm_release */
-#define CLONE_PARENT    0x00008000      /* set if we want to have the same parent as the cloner */
-#define CLONE_THREAD   0x00010000      /* Same thread group? */
-#define CLONE_NEWNS    0x00020000      /* New namespace group? */
-#define CLONE_SYSVSEM  0x00040000      /* share system V SEM_UNDO semantics */
-#define CLONE_SETTLS   0x00080000      /* create a new TLS for the child */
-#define CLONE_PARENT_SETTID    0x00100000      /* set the TID in the parent */
-#define CLONE_CHILD_CLEARTID   0x00200000      /* clear the TID in the child */
-#define CLONE_UNTRACED         0x00800000      /* set if the tracing process can't force CLONE_PTRACE on this clone */
-#define CLONE_CHILD_SETTID     0x01000000      /* set the TID in the child */
-#define CLONE_STOPPED          0x02000000      /* Start in stopped state */
-#define CLONE_NEWUTS           0x04000000      /* New utsname group? */
-#define CLONE_NEWIPC           0x08000000      /* New ipcs */
-#define CLONE_NEWUSER          0x10000000      /* New user namespace */
-#define CLONE_NEWPID           0x20000000      /* New pid namespace */
-#define CLONE_NEWNET           0x40000000      /* New network namespace */
-#define CLONE_IO               0x80000000      /* Clone io context */
+#include <sched.h>
+
+#ifndef CSIGNAL
+# define CSIGNAL 0x000000ff
+#endif
 
 #include "xlat/clone_flags.h"
 
@@ -68,8 +46,7 @@
 extern void print_user_desc(struct tcb *, long);
 #endif /* I386 || X86_64 || X32 */
 
-int
-sys_clone(struct tcb *tcp)
+SYS_FUNC(clone)
 {
        if (exiting(tcp)) {
                const char *sep = "|";
@@ -123,29 +100,22 @@ sys_clone(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_setns(struct tcb *tcp)
+SYS_FUNC(setns)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printflags(clone_flags, tcp->u_arg[1], "CLONE_???");
-       }
-       return 0;
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       printflags(clone_flags, tcp->u_arg[1], "CLONE_???");
+
+       return RVAL_DECODED;
 }
 
-int
-sys_unshare(struct tcb *tcp)
+SYS_FUNC(unshare)
 {
-       if (entering(tcp))
-               printflags(clone_flags, tcp->u_arg[0], "CLONE_???");
-       return 0;
+       printflags(clone_flags, tcp->u_arg[0], "CLONE_???");
+       return RVAL_DECODED;
 }
 
-int
-sys_fork(struct tcb *tcp)
+SYS_FUNC(fork)
 {
-       if (exiting(tcp))
-               return RVAL_UDECIMAL;
-       return 0;
+       return RVAL_DECODED | RVAL_UDECIMAL;
 }