X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2Fsyscall-legacy.hc;h=c307be0f4a96f75563f5a6da3689dfb03361e4ba;hb=c8a5f78c6350e9adae32fbcad8e4fbae95766604;hp=6bb8772068a16ca60a5b7446ec535b0c68db1510;hpb=9ce6c13ee8f8c304273fbbdef2e6fc6b3b038826;p=util-vserver.git diff --git a/util-vserver/lib/syscall-legacy.hc b/util-vserver/lib/syscall-legacy.hc index 6bb8772..c307be0 100644 --- a/util-vserver/lib/syscall-legacy.hc +++ b/util-vserver/lib/syscall-legacy.hc @@ -29,6 +29,8 @@ If this file does not have those system calls (not a patched kernel source) we rely on static values in this file. */ +#include "safechroot-internal.hc" + #include #include #include @@ -48,11 +50,37 @@ static int __NR_set_ipv4root_rev2; static int __NR_set_ipv4root_rev3; static int rev_ipv4root=0; +#if defined(__pic__) && defined(__i386) +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); +} -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_rev3(unsigned long *ip, int nb, unsigned long bcast, unsigned long * mask) +{ + return syscall(__NR_set_ipv4root_rev3, ip, nb, bcast, mask); +} + +#else +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 static int def_NR_new_s_context = 273; #undef __NR_new_s_context @@ -60,8 +88,16 @@ 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) +#if defined(__pic__) && defined(__i386) +inline static int +new_s_context_rev0(int newctx, int remove_cap, int flags) +{ + return syscall(__NR_new_s_context_rev0, newctx, remove_cap, flags); +} +#else +inline 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) +#endif #if 0 #undef __NR_set_ctxlimit @@ -71,12 +107,6 @@ static int rev_set_ctxlimit=-1; static _syscall2 (int, set_ctxlimit, int, resource, long, limit) #endif -#undef __NR_chrootsafe -static int __NR_chrootsafe=-1; -static int rev_chrootsafe=-1; - -static _syscall1 (int, chrootsafe, const char *, dir) - static void init() { static int is_init = 0; @@ -110,11 +140,6 @@ static void init() 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; @@ -190,47 +215,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(); - }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