git://git.onelab.eu
/
util-vserver-pl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
support reading of negative numbers for rlimit values
[util-vserver-pl.git]
/
src
/
planetlab.c
diff --git
a/src/planetlab.c
b/src/planetlab.c
index
447c858
..
db9c430
100644
(file)
--- a/
src/planetlab.c
+++ b/
src/planetlab.c
@@
-99,7
+99,7
@@
process:
if (unshare_flags != 0) {
unshare(unshare_flags);
if (unshare_flags != 0) {
unshare(unshare_flags);
- unshare_flags |= vc_space_mask();
+ unshare_flags |= vc_
get_
space_mask();
vc_set_namespace(ctx, unshare_flags);
}
vc_set_namespace(ctx, unshare_flags);
}
@@
-196,7
+196,7
@@
pl_chcontext(xid_t ctx, uint64_t bcaps, const struct sliver_resources *slr)
/* Unshare the net namespace if the slice if requested in the local slice configuration */
unshare_flags = get_space_flag(ctx);
if (unshare_flags != 0) {
/* Unshare the net namespace if the slice if requested in the local slice configuration */
unshare_flags = get_space_flag(ctx);
if (unshare_flags != 0) {
- unshare
|=vc_space_flags
();
+ unshare
_flags |=vc_get_space_mask
();
vc_enter_namespace(ctx, unshare_flags);
}
vc_enter_namespace(ctx, unshare_flags);
}
@@
-300,6
+300,10
@@
pl_get_limits(const char *context, struct sliver_resources *slr)
{"rlimits/openfd.soft", TYPE_LONG, &slr->vs_openfd.soft},
{"rlimits/openfd.min", TYPE_LONG, &slr->vs_openfd.min},
{"rlimits/openfd.soft", TYPE_LONG, &slr->vs_openfd.soft},
{"rlimits/openfd.min", TYPE_LONG, &slr->vs_openfd.min},
+ {"rlimits/memlock.hard", TYPE_LONG, &slr->vs_memlock.hard},
+ {"rlimits/memlock.soft", TYPE_LONG, &slr->vs_memlock.soft},
+ {"rlimits/memlock.min", TYPE_LONG, &slr->vs_memlock.min},
+
{"personality", TYPE_PERS, &slr->personality},
{0,0}
{"personality", TYPE_PERS, &slr->personality},
{0,0}
@@
-323,6
+327,10
@@
pl_get_limits(const char *context, struct sliver_resources *slr)
slr->vs_openfd.soft = VC_LIM_KEEP;
slr->vs_openfd.min = VC_LIM_KEEP;
slr->vs_openfd.soft = VC_LIM_KEEP;
slr->vs_openfd.min = VC_LIM_KEEP;
+ slr->vs_memlock.hard = VC_LIM_KEEP;
+ slr->vs_memlock.soft = VC_LIM_KEEP;
+ slr->vs_memlock.min = VC_LIM_KEEP;
+
slr->personality = 0;
cwd = open(".", O_RDONLY);
slr->personality = 0;
cwd = open(".", O_RDONLY);
@@
-348,8
+356,13
@@
pl_get_limits(const char *context, struct sliver_resources *slr)
buf[len-1]='\0';
len --;
}
buf[len-1]='\0';
len --;
}
- if ( (r->type == TYPE_LONG) && isdigit(*buf)) {
- *r->limit = atoi(buf);
+ if (r->type == TYPE_LONG) {
+ int val;
+ char *res=0;
+ errno=0;
+ val = strtol(buf,&res,0);
+ if ( !( (val==0 && res) || (errno!=0) ) )
+ *r->limit = val;
} else if ( (r->type == TYPE_PERS) && isalpha(*buf)) {
unsigned long int res;
res = vc_str2personalitytype(buf,len);
} else if ( (r->type == TYPE_PERS) && isalpha(*buf)) {
unsigned long int res;
res = vc_str2personalitytype(buf,len);
@@
-438,5
+451,6
@@
pl_set_ulimits(const struct sliver_resources *slr)
set_one_ulimit(RLIMIT_AS, &slr->vs_as);
set_one_ulimit(RLIMIT_NPROC, &slr->vs_nproc);
set_one_ulimit(RLIMIT_NOFILE, &slr->vs_openfd);
set_one_ulimit(RLIMIT_AS, &slr->vs_as);
set_one_ulimit(RLIMIT_NPROC, &slr->vs_nproc);
set_one_ulimit(RLIMIT_NOFILE, &slr->vs_openfd);
+ set_one_ulimit(RLIMIT_MEMLOCK, &slr->vs_memlock);
return set_personality(slr->personality);
}
return set_personality(slr->personality);
}