added Vector_zeroEnd() function
[util-vserver.git] / util-vserver / lib / syscall-legacy.hc
index d3950b2..f05daee 100644 (file)
@@ -31,7 +31,6 @@
 */
 #include "safechroot-internal.hc"
 
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -51,85 +50,129 @@ static int __NR_set_ipv4root_rev2;
 static int __NR_set_ipv4root_rev3;
 static int rev_ipv4root=0;
 
+#ifdef ENSC_SYSCALL_TRADITIONAL
+#  if defined __dietlibc__
+extern long int syscall (long int __sysno, ...);
+#  endif
 
-static _syscall1(int, set_ipv4root_rev0, unsigned long, ip)
-static _syscall2(int, set_ipv4root_rev1, unsigned long, ip, unsigned long, bcast)
-static _syscall3(int, set_ipv4root_rev2, unsigned long *, ip, int, nb, unsigned long, bcast)
-static _syscall4(int, set_ipv4root_rev3, unsigned long *, ip, int, nb, unsigned long, bcast, unsigned long *, mask)
+inline static int
+set_ipv4root_rev0(unsigned long ip)
+{
+  return syscall(__NR_set_ipv4root_rev0, ip);
+}
+
+inline static int
+set_ipv4root_rev1(unsigned long ip, unsigned long bcast)
+{
+  return syscall(__NR_set_ipv4root_rev1, ip, bcast);
+}
+
+inline static int
+set_ipv4root_rev2(unsigned long *ip, int nb, unsigned long bcast)
+{
+  return syscall(__NR_set_ipv4root_rev2, ip, nb, bcast);
+}
+
+inline static int
+set_ipv4root_rev3(unsigned long *ip, int nb, unsigned long bcast, unsigned long * mask)
+{
+  return syscall(__NR_set_ipv4root_rev3, ip, nb, bcast, mask);
+}
+
+#else  // ENSC_SYSCALL_TRADITIONAL
+inline static _syscall1(int, set_ipv4root_rev0, unsigned long, ip)
+inline static _syscall2(int, set_ipv4root_rev1, unsigned long, ip, unsigned long, bcast)
+inline static _syscall3(int, set_ipv4root_rev2, unsigned long *, ip, int, nb, unsigned long, bcast)
+inline static _syscall4(int, set_ipv4root_rev3, unsigned long *, ip, int, nb, unsigned long, bcast, unsigned long *, mask)
+#endif // ENSC_SYSCALL_TRADITIONAL
 
 static int def_NR_new_s_context = 273;
 #undef __NR_new_s_context
 static int __NR_new_s_context_rev0;
-  //static int __NR_new_s_context_rev1;
 static int rev_s_context=0;
 
-static _syscall3(int, new_s_context_rev0, int, newctx, int, remove_cap, int, flags)
-    //static _syscall4(int, new_s_context_rev1, int, nbctx, int *, ctxs, int, remove_cap, int, flags)
 
-#if 0
-#undef __NR_set_ctxlimit
-static int __NR_set_ctxlimit=-1;
-static int rev_set_ctxlimit=-1;
+#ifdef ENSC_SYSCALL_TRADITIONAL
+inline static xid_t
+new_s_context_rev0(int newctx, int remove_cap, int flags)
+{
+  return syscall(__NR_new_s_context_rev0, newctx, remove_cap, flags);
+}
+#else  // ENSC_SYSCALL_TRADITIONAL
+inline static _syscall3(int, new_s_context_rev0, int, newctx, int, remove_cap, int, flags)
+#endif // ENSC_SYSCALL_TRADITIONAL
+
+
+static bool    is_init = false;
+
+#include "utils-legacy.h"
 
-static _syscall2 (int, set_ctxlimit, int, resource, long, limit)
+#ifndef WRITE_MSG
+#  define WRITE_MSG(FD,X)         (void)(write(FD,X,sizeof(X)-1))
 #endif
 
-#undef __NR_chrootsafe
-static int __NR_chrootsafe=-1;
-static int rev_chrootsafe=-1;
 
-static _syscall1 (int, chrootsafe, const char *, dir)
+static bool
+getNumRevPair(char const *str, int *num, int *rev)
+{
+  char const * blank_pos = strchr(str, ' ');
+  char const * eol_pos   = strchr(str, '\n');
+  
+  *num = atoi(str);
+  if (*num==0) return false;
+  
+  if (blank_pos!=0 && eol_pos!=0 && blank_pos<eol_pos &&
+      strncmp(blank_pos+1, "rev", 3)==0)
+    *rev = atoi(blank_pos+4);
+
+  return true;
+}
 
-static bool    is_init = false;
+#define SET_TAG_POS(TAG)                       \
+  pos = strstr(buf, (TAG));                    \
+  if (pos) pos+=sizeof(TAG)-1
+
+static bool init_internal()
+{
+  size_t                       bufsize = utilvserver_getProcEntryBufsize();
+  char                         buf[bufsize];
+  char const *                 pos = 0;
+  pid_t                                pid = getpid();
+  int                          num;
+
+  errno = 0;
+
+  pos=utilvserver_getProcEntry(pid, 0, buf, bufsize);
+  if (pos==0 && errno==EAGAIN) return false;
   
+  SET_TAG_POS("\n__NR_set_ipv4root: ");
+  if ( pos!=0 && getNumRevPair(pos, &num, &rev_ipv4root) ) {
+    __NR_set_ipv4root_rev0 =
+      __NR_set_ipv4root_rev1 =
+      __NR_set_ipv4root_rev2 =
+      __NR_set_ipv4root_rev3 = num;
+  }
+
+  SET_TAG_POS("\n__NR_new_s_context: ");
+  if ( pos!=0 && getNumRevPair(pos, &num, &rev_s_context) )
+    __NR_new_s_context_rev0 = num;
+
+  return true;
+}
+
+#undef SET_TAG_POS
+
 static void init()
 {
        if (!is_init){
-               FILE *fin = fopen ("/proc/self/status","r");
                __NR_set_ipv4root_rev0 = def_NR_set_ipv4root;
                __NR_set_ipv4root_rev1 = def_NR_set_ipv4root;
                __NR_set_ipv4root_rev2 = def_NR_set_ipv4root;
                __NR_set_ipv4root_rev3 = def_NR_set_ipv4root;
                __NR_new_s_context_rev0 = def_NR_new_s_context;
-                 //__NR_new_s_context_rev1 = def_NR_new_s_context;
-               if (fin != NULL){
-                       char line[100];
-                       while (fgets(line,sizeof(line)-1,fin)!=NULL){
-                               int num;
-                               char title[100],rev[100];
-                               rev[0] = '\0';
-                               if (sscanf(line,"%s %d %s",title,&num,rev)>=2){
-                                       if (strcmp(title,"__NR_set_ipv4root:")==0){
-                                               __NR_set_ipv4root_rev0 = num;
-                                               __NR_set_ipv4root_rev1 = num;
-                                               __NR_set_ipv4root_rev2 = num;
-                                               __NR_set_ipv4root_rev3 = num;
-                                               if (strncmp(rev,"rev",3)==0){
-                                                       rev_ipv4root = atoi(rev+3);
-                                               }
-#if 0                                          
-                                       }else if (strcmp(title,"__NR_set_ctxlimit:")==0){
-                                               __NR_set_ctxlimit = num;
-                                               if (strncmp(rev,"rev",3)==0){
-                                                       rev_set_ctxlimit = atoi(rev+3);
-                                               }
-#endif                                         
-                                       }else if (strcmp(title,"__NR_chrootsafe:")==0){
-                                               __NR_chrootsafe = num;
-                                               if (strncmp(rev,"rev",3)==0){
-                                                       rev_chrootsafe = atoi(rev+3);
-                                               }
-                                       }else if (strcmp(title,"__NR_new_s_context:")==0){
-                                               __NR_new_s_context_rev0 = num;
-                                                 //__NR_new_s_context_rev1 = num;
-                                               if (strncmp(rev,"rev",3)==0){
-                                                       rev_s_context = atoi(rev+3);
-                                               }
-                                       }
-                               }
-                       }
-                       fclose (fin);
-               }
+
+               while (!init_internal() && errno==EAGAIN) {}
+
                is_init = true;
        }
 }
@@ -154,16 +197,16 @@ void vc_init_internal_legacy(int ctx_rev, int ctx_number,
   is_init = true;
 }
 
-static ALWAYSINLINE int
+static ALWAYSINLINE xid_t
 vc_new_s_context_legacy(int ctx, int remove_cap, int flags)
 {
-       int ret = -1;
+        xid_t ret = -1;
        init();
        if (rev_s_context == 0){
                return new_s_context_rev0(ctx, remove_cap, flags);
        }else{
                errno = -ENOSYS;
-               ret   = -1;
+               ret   = VC_NOCTX;
        }
        return ret;
 }
@@ -178,12 +221,12 @@ vc_set_ipv4root_legacy_internal (
        init();
        if (rev_ipv4root == 0){
                if (nb > 1){
-                       fprintf (stderr,"set_ipv4root: Several IP number specified, but this kernel only supports one. Ignored\n");
+                       WRITE_MSG(2,"set_ipv4root: Several IP number specified, but this kernel only supports one. Ignored\n");
                }
                return set_ipv4root_rev0 (ip[0]);
        }else if (rev_ipv4root == 1){
                if (nb > 1){
-                       fprintf (stderr,"set_ipv4root: Several IP number specified, but this kernel only supports one. Ignored\n");
+                       WRITE_MSG(2,"set_ipv4root: Several IP number specified, but this kernel only supports one. Ignored\n");
                }
                return set_ipv4root_rev1 (ip[0],bcast);
        }else if (rev_ipv4root == 2){
@@ -200,7 +243,7 @@ vc_set_ipv4root_legacy(uint32_t  bcast, size_t nb, struct vc_ip_mask_pair const
 {
   unsigned long        ip[nb];
   unsigned long        mask[nb];
-  size_t               i;
+  size_t       i;
 
   for (i=0; i<nb; ++i) {
     ip[i]   = ips[i].ip;
@@ -209,48 +252,3 @@ vc_set_ipv4root_legacy(uint32_t  bcast, size_t nb, struct vc_ip_mask_pair const
 
   return vc_set_ipv4root_legacy_internal(ip, nb, bcast, mask);
 }
-
-static ALWAYSINLINE int
-vc_chrootsafe_legacy (const char *dir)
-{
-       init();
-       if (rev_chrootsafe == -1){
-               vc_tell_unsafe_chroot();
-               return chroot(dir);
-       }else if (rev_chrootsafe == 0){
-               return chrootsafe (dir);
-       }else{
-               fprintf (stderr,"chrootsafe: kernel support version %d, application expects version 0\n"
-                       ,rev_chrootsafe);
-       }
-       errno = EINVAL;
-       return -1;
-}
-
-#if 0
-/*
-       Return != 0 if chrootsafe is available
-*/
-int has_chrootsafe()
-{
-       init();
-       return rev_chrootsafe != -1;
-}
-
-int call_set_ctxlimit (int res, long limit)
-{
-       init();
-       if (rev_set_ctxlimit == -1){
-               fprintf (stderr,"set_ctxlimit: Unsupported system call, update kernel\n");
-       }else if (rev_set_ctxlimit == 0){
-               return set_ctxlimit (res,limit);
-       }else{
-               fprintf (stderr,"set_ctxlimit: kernel support version %d, application expects version 0\n"
-                       ,rev_set_ctxlimit);
-       }
-       errno = EINVAL;
-       return -1;
-}
-
-
-#endif