woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmdline: better errors for setting rlimits

Browse Source
This commit is contained in:
Robert Swiecki 2017-10-07 12:37:26 +02:00
parent e89a6f0c24
commit 6ada77d4cf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmdline.c
View File

@ -254,6 +254,9 @@ void cmdlineLogParams(struct nsjconf_t *nsjconf)
__rlim64_t cmdlineParseRLimit(int res, const char *optarg, unsigned long mul)
{
if (strcasecmp(optarg, "inf") == 0) {
return RLIM64_INFINITY;
}
struct rlimit64 cur;
if (getrlimit64(res, &cur) == -1) {
PLOG_F("getrlimit(%d)", res);
@ -264,11 +267,8 @@ __rlim64_t cmdlineParseRLimit(int res, const char *optarg, unsigned long mul)
if (strcasecmp(optarg, "max") == 0 || strcasecmp(optarg, "hard")) {
return cur.rlim_max;
}
if (strcasecmp(optarg, "inf") == 0) {
return RLIM64_INFINITY;
}
if (utilIsANumber(optarg) == false) {
LOG_F("RLIMIT %d needs a numeric or 'max'/'def' value ('%s' provided)", res,
LOG_F("RLIMIT %d needs a numeric or 'max'/'hard'/'def'/'soft'/'inf' value ('%s' provided)", res,
optarg);
}
__rlim64_t val = strtoull(optarg, NULL, 0) * mul;