d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rctl rule filters - eg the 'rctl -r :' case.

Browse Source 
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
trasz 2015-12-01 14:02:14 +00:00
parent 80cfe1acb1
commit 581e0c667d
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
usr.bin/rctl/rctl.c
View File

@ -111,22 +111,38 @@ parse_group(const char *s, id_t *gidp, const char *unexpanded_rule)
* Replace human-readable number with its expanded form.
*/
static char *
expand_amount(char *rule, const char *unexpanded_rule)
expand_amount(const char *rule, const char *unexpanded_rule)
{
uint64_t num;
const char *subject, *subject_id, *resource, *action, *amount, *per;
char *expanded;
char *copy, *expanded, *tofree;
int ret;
subject = strsep(&rule, ":");
subject_id = strsep(&rule, ":");
resource = strsep(&rule, ":");
action = strsep(&rule, "=/");
amount = strsep(&rule, "/");
per = rule;
tofree = copy = strdup(rule);
if (copy == NULL) {
warn("strdup");
return (NULL);
}
if (amount == NULL || strlen(amount) == 0)
return (rule);
subject = strsep(&copy, ":");
subject_id = strsep(&copy, ":");
resource = strsep(&copy, ":");
action = strsep(&copy, "=/");
amount = strsep(&copy, "/");
per = copy;
if (amount == NULL || strlen(amount) == 0) {
/*
* The "copy" has already been tinkered with by strsep().
*/
free(tofree);
copy = strdup(rule);
if (copy == NULL) {
warn("strdup");
return (NULL);
}
return (copy);
}
assert(subject != NULL);
assert(subject_id != NULL);
@ -136,6 +152,7 @@ expand_amount(char *rule, const char *unexpanded_rule)
if (expand_number(amount, &num)) {
warnx("malformed rule '%s': invalid numeric value '%s'",
unexpanded_rule, amount);
free(tofree);
return (NULL);
}
@ -149,9 +166,12 @@ expand_amount(char *rule, const char *unexpanded_rule)
if (ret <= 0) {
warn("asprintf");
free(tofree);
return (NULL);
}
free(tofree);
return (expanded);
}