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

Don't allow jail.conf variables to have the same names as jail parameters.

Browse Source 
It was already not allowed in many cases, but crashed instead of giving an
error.

PR:		248444
This commit is contained in:
Jamie Gritton 2020-08-27 00:17:17 +00:00
parent 62cddd0e03
commit bb4ec28922
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.sbin/jail/config.c
View File

@ -366,8 +366,13 @@ add_param(struct cfjail *j, const struct cfparam *p, enum intparam ipnum,
break;
if (dp != NULL) {
/* Found it - append or replace. */
if ((flags ^ dp->flags) & PF_VAR) {
jail_warnx(j, "variable \"$%s\" cannot have the same "
"name as a parameter.", name);
return;
}
if (dp->flags & PF_IMMUTABLE) {
jail_warnx(j, "cannot redefine variable \"%s\".",
jail_warnx(j, "cannot redefine parameter \"%s\".",
dp->name);
return;
}
@ -394,6 +399,14 @@ add_param(struct cfjail *j, const struct cfparam *p, enum intparam ipnum,
for (ipnum = IP__NULL + 1; ipnum < IP_NPARAM; ipnum++)
if (!(intparams[ipnum].flags & PF_CONV) &&
equalopts(name, intparams[ipnum].name)) {
if (flags & PF_VAR) {
jail_warnx(j,
"variable \"$%s\" "
"cannot have the same "
"name as a parameter.",
name);
return;
}
j->intparams[ipnum] = np;
np->flags |= intparams[ipnum].flags;
break;