svn commit: r351094 - in stable: 11/sbin/ipfw 12/sbin/ipfw

[Kyle Evans]

Author: kevans
Date: Thu Aug 15 17:40:48 2019
New Revision: 351094
URL: https://svnweb.freebsd.org/changeset/base/351094

Log:
  MFC r350576: 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.

Modified:
  stable/12/sbin/ipfw/ipfw2.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sbin/ipfw/ipfw2.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/sbin/ipfw/ipfw2.c
==============================================================================
--- stable/12/sbin/ipfw/ipfw2.c	Thu Aug 15 17:35:24 2019	(r351093)
+++ stable/12/sbin/ipfw/ipfw2.c	Thu Aug 15 17:40:48 2019	(r351094)
@@ -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);
 			av++;