#include <sys/mount.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/resource.h>
#include <fcntl.h>
#include <ctype.h>
#include <stdarg.h>
return 0;
}
-static int sandbox_processes(xid_t xid)
+#define WHITESPACE(buffer,index,len) \
+ while(isspace((int)buffer[index])) \
+ if (index < len) index++; else goto out;
+
+struct resources {
+ char *name;
+ unsigned long long *limit;
+};
+
+#define VSERVERCONF "/etc/vservers/"
+static void get_limits(char *context, struct resources *list){
+ FILE *fb;
+ size_t len = strlen(VSERVERCONF) + strlen(context) + strlen(".conf") + NULLBYTE_SIZE;
+ char *conf = (char *)malloc(len);
+ struct resources *r;
+
+ sprintf(conf, "%s%s.conf", VSERVERCONF, context);
+
+ /* open the conf file for reading */
+ fb = fopen(conf,"r");
+ if (fb != NULL) {
+ size_t index;
+ char *buffer = malloc(1000);
+ char *p;
+
+ /* the conf file exist */
+ while((p=fgets(buffer,1000-1,fb))!=NULL) {
+ index = 0;
+ len = strnlen(buffer,1000);
+ WHITESPACE(buffer,index,len);
+ if (buffer[index] == '#')
+ continue;
+
+ for (r=list; r->name; r++)
+ if ((p=strstr(&buffer[index],r->name))!=NULL) {
+ /* adjust index into buffer */
+ index+= (p-&buffer[index])+strlen(r->name);
+
+ /* skip over whitespace */
+ WHITESPACE(buffer,index,len);
+
+ /* expecting to see = sign */
+ if (buffer[index++]!='=') goto out;
+
+ /* skip over whitespace */
+ WHITESPACE(buffer,index,len);
+
+ /* expecting to see a digit for number */
+ if (!isdigit((int)buffer[index])) goto out;
+
+ *r->limit = atoi(&buffer[index]);
+ break;
+ }
+ }
+ out:
+ free(buffer);
+ } else {
+ fprintf(stderr,"cannot open %s\n",conf);
+ }
+ free(conf);
+}
+
+
+static int sandbox_processes(xid_t xid, char *context)
{
#ifdef CONFIG_VSERVER_LEGACY
int flags;
exit(1);
}
#else
+ struct vc_rlimit limits;
struct vc_ctx_caps caps;
struct vc_ctx_flags flags;
+ xid_t ctx;
+ unsigned long long cpu = VC_LIM_KEEP;
+ unsigned long long mem = VC_LIM_KEEP;
+ unsigned long long task = VC_LIM_KEEP;
+ unsigned long long cpuguaranteed = 0;
+ struct resources list[] =
+ {{"MEMLIMIT", &mem},
+ {"CPULIMIT", &cpu},
+ {"CPUGUARANTEED", &cpuguaranteed},
+ {"TASKLIMIT", &task},
+ {0,0}};
+
+ get_limits(context,list);
+ (void) (sandbox_chroot(xid));
+
caps.ccaps = ~vc_get_insecureccaps();
caps.cmask = ~0ull;
caps.bcaps = ~vc_get_insecurebcaps();
flags.flagword = VC_VXF_INFO_LOCK;
flags.mask = VC_VXF_STATE_SETUP | VC_VXF_INFO_LOCK;
- if ((vc_ctx_create(xid) == VC_NOCTX) && (errno != EEXIST)) {
+ ctx = vc_ctx_create(xid);
+ if (ctx == VC_NOCTX && errno != EEXIST) {
PERROR("vc_ctx_create(%d)", xid);
exit(1);
}
+ /* CPU */
+ if (cpu != VC_LIM_KEEP) {
+ struct vc_set_sched sched = {
+ .set_mask = 0
+ };
+
+ /* Need to distinguish between guarantee (hard) and
+ * best effort (share) from the vserver
+ * configuration.
+ */
+#define VC_VXF_SCHED_SHARE 0x00000800ull
+ flags.flagword |= VC_VXF_SCHED_HARD;
+ flags.mask |= VC_VXF_SCHED_HARD;
+ if (cpuguaranteed==0) {
+ flags.flagword |= VC_VXF_SCHED_SHARE;
+ flags.mask |= VC_VXF_SCHED_SHARE;
+ }
+
+ /* CPULIMIT value from /etc/vservers/xyz.conf */
+ sched.fill_rate = cpu;
+ sched.set_mask |= VC_VXSM_FILL_RATE;
+
+ sched.interval = 1000; /* Andy's default value */
+ sched.set_mask |= VC_VXSM_INTERVAL;
+
+ /* set base token value for new contexts */
+ if (ctx != VC_NOCTX) {
+ sched.tokens = 100; /* Andy's default value */
+ sched.set_mask |= VC_VXSM_TOKENS;
+ }
+
+ sched.tokens_min = 50; /* Andy's default value */
+ sched.tokens_max = 100; /* Andy's default value */
+ sched.set_mask |= VC_VXSM_TOKENS_MIN;
+ sched.set_mask |= VC_VXSM_TOKENS_MAX;
+
+ if (vc_set_sched(xid, &sched)==-1) {
+ PERROR("vc_set_sched()");
+ exit(1);
+ }
+ }
+
+ /* MEM */
+ limits.min = VC_LIM_KEEP;
+ limits.soft = VC_LIM_KEEP;
+ limits.hard = mem;
+ if (vc_set_rlimit(xid, RLIMIT_RSS, &limits)) {
+ PERROR("vc_set_rlimit(%d, %d, %d/%d/%d)",
+ xid, RLIMIT_RSS, limits.min, limits.soft, limits.hard);
+ exit(1);
+ }
+
+ /* TASK */
+ limits.min = VC_LIM_KEEP;
+ limits.soft = VC_LIM_KEEP;
+ limits.hard = task;
+ if (vc_set_rlimit(xid, RLIMIT_NPROC, &limits)) {
+ PERROR("vc_set_rlimit(%d, %d, %d/%d/%d)",
+ xid, RLIMIT_NPROC, limits.min, limits.soft, limits.hard);
+ exit(1);
+ }
+
if (vc_set_ccaps(xid, &caps) == -1) {
- PERROR("vc_set_ccaps(%d, 0x%16ullx/0x%16ullx, 0x%16ullx/0x%16ullx)\n",
+ PERROR("vc_set_ccaps(%d, 0x%16ullx/0x%16ullx, 0x%16ullx/0x%16ullx)",
xid, caps.ccaps, caps.cmask, caps.bcaps, caps.bmask);
exit(1);
}
if (vc_set_cflags(xid, &flags) == -1) {
- PERROR("vc_set_cflags(%d, 0x%16llx/0x%16llx)\n",
+ PERROR("vc_set_cflags(%d, 0x%16llx/0x%16llx)",
xid, flags.flagword, flags.mask);
exit(1);
}
+
+ /* context already exists, migrate to it */
+ if (ctx == VC_NOCTX && vc_ctx_migrate(xid) == -1) {
+ PERROR("vc_ctx_migrate(%d)", xid);
+ exit(1);
+ }
#endif
return 0;
}
struct passwd pwdd, *pwd = &pwdd, *result;
char *pwdBuffer;
long pwdBuffer_len;
- unsigned remove_cap;
uid_t uid;
pwdBuffer_len = sysconf(_SC_GETPW_R_SIZE_MAX);
PERROR("getpwnam_r(%s)", context);
exit(2);
}
-
- context = (char*)malloc(strlen(pwd->pw_name)+NULLBYTE_SIZE);
- if (!context) {
- PERROR("malloc(%d)");
- exit(2);
- }
- strcpy(context,pwd->pw_name);
+ uid = pwd->pw_uid;
if (setuidgid_root() < 0) { /* For chroot, new_s_context */
fprintf(stderr, "vsh: Could not become root, check that SUID flag is set on binary\n");
exit(2);
}
- uid = pwd->pw_uid;
-
- if (sandbox_chroot(uid) < 0) {
- fprintf(stderr, "vsh: Could not chroot\n");
- exit(2);
- }
+#ifdef CONFIG_VSERVER_LEGACY
+ (void) (sandbox_chroot(uid));
+#endif
- if (sandbox_processes((xid_t) uid) < 0) {
+ if (sandbox_processes((xid_t) uid, context) < 0) {
fprintf(stderr, "vsh: Could not change context to %d\n", uid);
exit(2);
}
git://git.onelab.eu / util-vserver.git / blobdiff