--- Linux-Clone/Clone.xs	2016/08/24 03:34:24	1.2
+++ Linux-Clone/Clone.xs	2022/09/03 23:56:10	1.7
@@ -8,6 +8,31 @@
 #undef _GNU_SOURCE
 #define _GNU_SOURCE
 #include <sched.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+
+#include <sched.h>
+
+#include <sys/ioctl.h>
+#include <net/if.h>
+
+#include <linux/nsfs.h>
+
+#ifdef __has_include
+  #if !__has_include("linux/kcmp.h") // use "" as GCC wrongly expands macros
+    #undef SYS_kcmp
+  #endif
+#endif
+
+#ifdef SYS_kcmp
+  #include "linux/kcmp.h"
+  #define kcmp(pid1,pid2,type,idx1,idx2) \
+    syscall (SYS_kcmp, (pid_t)pid1, (pid_t)pid2, \
+             (int)type, (unsigned long)idx1, (unsigned long)idx2)
+#else
+  #define kcmp(pid1,pid2,type,idx1,idx2) \
+    (errno = ENOSYS, -1)
+#endif
 
 /* from schmorp.h */
 static int
@@ -58,72 +83,101 @@
     const char *name;
     IV iv;
   } *civ, const_iv[] = {
-#   define const_iv(name) { # name, (IV) CLONE_ ## name },
+#   define const_iv(name)       { # name, (IV)name },
+#   define const_iv_clone(name) { # name, (IV) CLONE_ ## name },
+#   ifdef CSIGNAL
+      const_iv (CSIGNAL)
+#   endif
 #   ifdef CLONE_FILES
-      const_iv (FILES)
+      const_iv_clone (FILES)
 #   endif
 #   ifdef CLONE_FS
-      const_iv (FS)
+      const_iv_clone (FS)
 #   endif
 #   ifdef CLONE_NEWNS
-      const_iv (NEWNS)
+      const_iv_clone (NEWNS)
 #   endif
 #   ifdef CLONE_VM
-      const_iv (VM)
+      const_iv_clone (VM)
 #   endif
 #   ifdef CLONE_THREAD
-      const_iv (THREAD)
+      const_iv_clone (THREAD)
 #   endif
 #   ifdef CLONE_SIGHAND
-      const_iv (SIGHAND)
+      const_iv_clone (SIGHAND)
 #   endif
 #   ifdef CLONE_SYSVSEM
-      const_iv (SYSVSEM)
+      const_iv_clone (SYSVSEM)
 #   endif
 #   ifdef CLONE_NEWUTS
-      const_iv (NEWUTS)
+      const_iv_clone (NEWUTS)
 #   endif
 #   ifdef CLONE_NEWIPC
-      const_iv (NEWIPC)
+      const_iv_clone (NEWIPC)
 #   endif
 #   ifdef CLONE_NEWNET
-      const_iv (NEWNET)
+      const_iv_clone (NEWNET)
 #   endif
 #   ifdef CLONE_PTRACE
-      const_iv (PTRACE)
+      const_iv_clone (PTRACE)
 #   endif
 #   ifdef CLONE_VFORK
-      const_iv (VFORK)
+      const_iv_clone (VFORK)
 #   endif
 #   ifdef CLONE_SETTLS
-      const_iv (SETTLS)
+      const_iv_clone (SETTLS)
 #   endif
 #   ifdef CLONE_PARENT_SETTID
-      const_iv (PARENT_SETTID)
+      const_iv_clone (PARENT_SETTID)
 #   endif
 #   ifdef CLONE_CHILD_CLEARTID
-      const_iv (CHILD_CLEARTID)
+      const_iv_clone (CHILD_CLEARTID)
 #   endif
 #   ifdef CLONE_DETACHED
-      const_iv (DETACHED)
+      const_iv_clone (DETACHED)
 #   endif
 #   ifdef CLONE_UNTRACED
-      const_iv (UNTRACED)
+      const_iv_clone (UNTRACED)
 #   endif
 #   ifdef CLONE_CHILD_SETTID
-      const_iv (CHILD_SETTID)
+      const_iv_clone (CHILD_SETTID)
 #   endif
 #   ifdef CLONE_NEWUSER
-      const_iv (NEWUSER)
+      const_iv_clone (NEWUSER)
 #   endif
 #   ifdef CLONE_NEWPID
-      const_iv (NEWPID)
+      const_iv_clone (NEWPID)
 #   endif
 #   ifdef CLONE_IO
-      const_iv (IO)
+      const_iv_clone (IO)
 #   endif
 #   ifdef CLONE_NEWCGROUP
-      const_iv (NEWCGROUP)
+      const_iv_clone (NEWCGROUP)
+#   endif
+#   ifdef CLONE_PIDFD
+      const_iv_clone (PIDFD)
+#   endif
+#   ifdef SYS_kcmp
+      const_iv (KCMP_FILE)
+      const_iv (KCMP_VM)
+      const_iv (KCMP_FILES)
+      const_iv (KCMP_FS)
+      const_iv (KCMP_SIGHAND)
+      const_iv (KCMP_IO)
+      const_iv (KCMP_SYSVSEM)
+      const_iv (KCMP_FILE)
+#   endif
+#   ifdef NS_GET_USERNS
+      const_iv (NS_GET_USERNS)
+#   endif
+#   ifdef NS_GET_PARENT
+      const_iv (NS_GET_PARENT)
+#   endif
+#   ifdef NS_GET_NSTYPE
+      const_iv (NS_GET_NSTYPE)
+#   endif
+#   ifdef NS_OWNER_UID
+      const_iv (NS_OWNER_UID
 #   endif
   };
 
@@ -161,8 +215,7 @@
               }
           }
 }
-	OUTPUT:
-        RETVAL
+	OUTPUT: RETVAL
 
 int
 unshare (int flags)
@@ -170,3 +223,30 @@
 int
 setns (SV *fh_or_fd, int nstype = 0)
 	C_ARGS: s_fileno (fh_or_fd, 0), nstype
+
+int
+pivot_root (SV *new_root, SV *old_root)
+	CODE:
+        RETVAL = syscall (SYS_pivot_root,
+                          (const char *)SvPVbyte_nolen (new_root),
+                          (const char *)SvPVbyte_nolen (old_root));
+	OUTPUT: RETVAL
+
+int
+kcmp (IV pid1, IV pid2, IV type, UV idx1 = 0, UV idx2 = 0)
+
+int
+siocsifflags (char *ifname, U32 flags = IFF_UP)
+	CODE:
+{
+        int saved_errno;
+	struct ifreq ifr;
+	int fd = socket (AF_INET, SOCK_DGRAM, 0);
+        strncpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
+        RETVAL = ioctl (fd, SIOCSIFFLAGS, &ifr);
+        saved_errno = errno;
+        close (fd);
+        errno = saved_errno;
+}
+	OUTPUT: RETVAL
+