X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Flib%2Fsyscall.c;h=cde39e3f82cce5fe137b57326e10a5e81c315746;hb=3eb1b2279739d0f16391a3724a9897c686f030d3;hp=9f6ef391d2992fe9109b5df7e5b64fedab353698;hpb=604c7e22a69f1e6c2e206304ef01b15bc8ab0774;p=util-vserver.git diff --git a/util-vserver/lib/syscall.c b/util-vserver/lib/syscall.c index 9f6ef39..cde39e3 100644 --- a/util-vserver/lib/syscall.c +++ b/util-vserver/lib/syscall.c @@ -1,12 +1,10 @@ -// $Id$ +// $Id$ --*- c++ -*-- // Copyright (C) 2003 Enrico Scholz -// based on syscall.cc by Jacques Gelinas // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2, or (at your option) -// any later version. +// the Free Software Foundation; version 2 of the License. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -17,205 +15,50 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -/* - This tells the system call number for new_s_context and set_ipv4root - using /proc/self/status. This helps until the vserver project is - included officially in the kernel (and has its own syscall). - We rely on /proc/self/status to find the syscall number. - - If it is not there, we rely on adm/unistd.h. - - If this file does not have those system calls (not a patched kernel source) - we rely on static values in this file. -*/ -#include -#include -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include +#endif #include "compat.h" #include "vserver.h" +#include "internal.h" -// 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 -// If this fails, we have the old preserved copy. -static int def_NR_set_ipv4root = 227; -#undef __NR_set_ipv4root - -static int __NR_set_ipv4root_rev0; -static int __NR_set_ipv4root_rev1; -static int __NR_set_ipv4root_rev2; -static int __NR_set_ipv4root_rev3; -static int rev_ipv4root=0; - - -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) +#define _LINUX_TYPES_H 1 +#include "linuxvirtual.h" -static int def_NR_new_s_context = 226; -#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; +#if defined(VC_ENABLE_API_COMPAT) && defined(VC_ENABLE_API_LEGACY) +# define VC_MULTIVERSION_SYSCALL 1 +#endif +#include "vserver-internal.h" -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) +#ifdef VC_ENABLE_API_COMPAT +# include "syscall-compat.hc" +#endif -#undef __NR_set_ctxlimit -static int __NR_set_ctxlimit=-1; -static int rev_set_ctxlimit=-1; - -static _syscall2 (int, set_ctxlimit, int, resource, long, limit) - -#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; - 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_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); - } - }else if (strcmp(title,"__NR_set_ctxlimit:")==0){ - __NR_set_ctxlimit = num; - if (strncmp(rev,"rev",3)==0){ - rev_set_ctxlimit = atoi(rev+3); - } - }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; - } -} +#ifdef VC_ENABLE_API_LEGACY +# include "syscall-legacy.hc" +#endif -void vserver_init() -{ - init(); -} +#include +#include -int call_new_s_context(int nbctx, int ctxs[], int remove_cap, int flags) -{ - int ret = -1; - init(); - if (rev_s_context == 0){ - if (nbctx > 1){ - errno = EINVAL; - fprintf (stderr,"The current kernel does not support new_s_context revision 1\n"); - }else if (nbctx == 0){ - ret = new_s_context_rev0(-2,remove_cap,flags); - }else if (nbctx == 1){ - ret = new_s_context_rev0(ctxs[0],remove_cap,flags); - } - }else{ -fprintf (stderr,"new_s_context rev1 %d %d\n",nbctx,ctxs[0]); - ret = new_s_context_rev1(nbctx,ctxs,remove_cap,flags); - } - return ret; -} -int call_set_ipv4root ( - unsigned long ip[], - int nb, - unsigned long bcast, - unsigned long mask[]) -{ - init(); - if (rev_ipv4root == 0){ - if (nb > 1){ - fprintf (stderr,"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"); - } - return set_ipv4root_rev1 (ip[0],bcast); - }else if (rev_ipv4root == 2){ - return set_ipv4root_rev2 (ip,nb,bcast); - }else if (rev_ipv4root == 3){ - return set_ipv4root_rev3 (ip,nb,bcast,mask); - } - errno = EINVAL; - return -1; -} +#if defined(VC_ENABLE_API_COMPAT) || defined(VC_ENABLE_API_LEGACY) -int call_chrootsafe (const char *dir) +xid_t +vc_new_s_context(xid_t ctx, unsigned int remove_cap, unsigned int flags) { - init(); - if (rev_chrootsafe == -1){ - fprintf (stderr,"chrootsafe: Unsupported system call, update kernel\n"); - }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; + CALL_VC(CALL_VC_COMPAT(vc_new_s_context, ctx, remove_cap, flags), + CALL_VC_LEGACY(vc_new_s_context, ctx, remove_cap, flags)); } -/* - Return != 0 if chrootsafe is available -*/ -int has_chrootsafe() +int +vc_set_ipv4root(uint32_t bcast, size_t nb, struct vc_ip_mask_pair const *ips) { - init(); - return rev_chrootsafe != -1; + CALL_VC(CALL_VC_COMPAT(vc_set_ipv4root, bcast, nb, ips), + CALL_VC_LEGACY(vc_set_ipv4root, bcast, nb, ips)); } -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; -} - - +LINK_WARNING("vc_new_s_context", "warning: vc_new_s_context() is obsoleted; use vc_create_context() instead of"); +#endif