diff options
authorKyle Evans <kevans@FreeBSD.org>2019-08-05 00:08:25 +0000
committerKyle Evans <kevans@FreeBSD.org>2019-08-05 00:08:25 +0000
commitc144616b7db4e977a0309c2fe5f5c45923e280c0 (patch)
parent41059019330a03ef5da59e25ba3e73379b893653 (diff)
ipfw: fix jail option after r348215
r348215 changed jail_getid(3) to validate passed-in jids as active jails (as the function is documented to return -1 if the jail does not exist). This broke the jail option (in some cases?) as the jail historically hasn't needed to exist at the time of rule parsing; jids will get stored and later applied. Fix this caller to attempt to parse *av as a number first and just use it as-is to match historical behavior. jail_getid(3) must still be used in order for name arguments to work, but it's strictly a fallback in case we weren't given a number. Reported and tested by: Ari Suutari <ari stonepile fi> Reviewed by: ae MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D21128
Notes: svn path=/head/; revision=350576
1 files changed, 18 insertions, 3 deletions
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c
index c2d89fcbf72f..c81822782644 100644
--- a/sbin/ipfw/ipfw2.c
+++ b/sbin/ipfw/ipfw2.c
@@ -4674,12 +4674,27 @@ read_options:
case TOK_JAIL:
NEED1("jail requires argument");
+ char *end;
int jid;
cmd->opcode = O_JAIL;
- jid = jail_getid(*av);
- if (jid < 0)
- errx(EX_DATAERR, "%s", jail_errmsg);
+ /*
+ * If av is a number, then we'll just pass it as-is. If
+ * it's a name, try to resolve that to a jid.
+ *
+ * We save the jail_getid(3) call for a fallback because
+ * it entails an unconditional trip to the kernel to
+ * either validate a jid or resolve a name to a jid.
+ * This specific token doesn't currently require a
+ * jid to be an active jail, so we save a transition
+ * by simply using a number that we're given.
+ */
+ jid = strtoul(*av, &end, 10);
+ if (*end != '\0') {
+ jid = jail_getid(*av);
+ if (jid < 0)
+ errx(EX_DATAERR, "%s", jail_errmsg);
+ }
cmd32->d[0] = (uint32_t)jid;
cmd->len |= F_INSN_SIZE(ipfw_insn_u32);