X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2Fsyscall-legacy.hc;h=f05daeeb596f9d7e7dbd99b42f00376fcf3e15db;hb=38fe8b4a2dd28aebf52787c5b65cc79490fa53d3;hp=79dc78c1c060add42f1b2d57422d554f366e0035;hpb=9cde6b2e1f86d390b0730cb5339eb4920d631886;p=util-vserver.git diff --git a/util-vserver/lib/syscall-legacy.hc b/util-vserver/lib/syscall-legacy.hc index 79dc78c..f05daee 100644 --- a/util-vserver/lib/syscall-legacy.hc +++ b/util-vserver/lib/syscall-legacy.hc @@ -31,12 +31,12 @@ */ #include "safechroot-internal.hc" -#include #include #include #include #include #include +#include // Here is the trick. We keep a copy of the define, then undef it // and then later, we try to locate the value reading /proc/self/status @@ -50,85 +50,130 @@ 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=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); - } - is_init = 1; + + while (!init_internal() && errno==EAGAIN) {} + + is_init = true; } } @@ -137,16 +182,31 @@ void vc_init_legacy() init(); } -static ALWAYSINLINE int +void vc_init_internal_legacy(int ctx_rev, int ctx_number, + int ipv4_rev, int ipv4_number) +{ + rev_s_context = ctx_rev; + __NR_new_s_context_rev0 = ctx_number; + + rev_ipv4root = ipv4_rev; + __NR_set_ipv4root_rev0 = ipv4_number; + __NR_set_ipv4root_rev1 = ipv4_number; + __NR_set_ipv4root_rev2 = ipv4_number; + __NR_set_ipv4root_rev3 = ipv4_number; + + is_init = true; +} + +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; } @@ -161,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){ @@ -183,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