diff options
| author | hrs <hrs@FreeBSD.org> | 2015-07-08 16:37:48 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2015-07-08 16:37:48 +0000 |
| commit | 6a6f4266c7bdb95f45b0f4822b0f7e176a775549 (patch) | |
| tree | 578a65a227f0ecaf6cfbf24323c2ec4b8d647d84 /usr.sbin/jail | |
| parent | 3702cad7147f84200a3eb8f9e08870b3dd1e04ba (diff) | |
| download | FreeBSD-src-6a6f4266c7bdb95f45b0f4822b0f7e176a775549.zip FreeBSD-src-6a6f4266c7bdb95f45b0f4822b0f7e176a775549.tar.gz | |
Implement PF_IMMUTABLE flag and apply it to "name" and "jid" in
jail.conf parameters. This flag disallows redefinition of the parameter.
"name" and/or "jid" are automatically defined in jail.conf by using
the jail names at the front of jail parameter definitions. However,
one could override them by using a variable with the same name like
$name = "foo". This confused the parser and could end up with SIGSEGV.
Note that this change also affects a case when all of parameters are
defined in the command line arguments, not in jail.conf. Specifically,
"jail -c name=j1 name=j2" no longer works. This should be harmless.
PR: 196574
Reviewed by: jamie
Differential Revision: https://reviews.freebsd.org/D3017
Diffstat (limited to 'usr.sbin/jail')
| -rw-r--r-- | usr.sbin/jail/config.c | 9 | ||||
| -rw-r--r-- | usr.sbin/jail/jailp.h | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c index 1dd04498..87b8ef9 100644 --- a/usr.sbin/jail/config.c +++ b/usr.sbin/jail/config.c @@ -111,8 +111,8 @@ static const struct ipspec intparams[] = { #ifdef INET6 [KP_IP6_ADDR] = {"ip6.addr", 0}, #endif - [KP_JID] = {"jid", 0}, - [KP_NAME] = {"name", 0}, + [KP_JID] = {"jid", PF_IMMUTABLE}, + [KP_NAME] = {"name", PF_IMMUTABLE}, [KP_PATH] = {"path", 0}, [KP_PERSIST] = {"persist", 0}, [KP_SECURELEVEL] = {"securelevel", 0}, @@ -362,6 +362,11 @@ add_param(struct cfjail *j, const struct cfparam *p, enum intparam ipnum, break; if (dp != NULL) { /* Found it - append or replace. */ + if (dp->flags & PF_IMMUTABLE) { + jail_warnx(j, "cannot redefine variable \"%s\".", + dp->name); + return; + } if (strcmp(dp->name, name)) { free(dp->name); dp->name = estrdup(name); diff --git a/usr.sbin/jail/jailp.h b/usr.sbin/jail/jailp.h index bfefca5..d2c929e 100644 --- a/usr.sbin/jail/jailp.h +++ b/usr.sbin/jail/jailp.h @@ -51,6 +51,7 @@ #define PF_INT 0x20 /* Integer parameter */ #define PF_CONV 0x40 /* Parameter duplicated in converted form */ #define PF_REV 0x80 /* Run commands in reverse order on stopping */ +#define PF_IMMUTABLE 0x100 /* Immutable parameter */ #define JF_START 0x0001 /* -c */ #define JF_SET 0x0002 /* -m */ |
