svn commit: r337919 - head/usr.sbin/jail

[Jamie Gritton]

Author: jamie
Date: Thu Aug 16 18:30:49 2018
New Revision: 337919
URL: https://svnweb.freebsd.org/changeset/base/337919

Log:
  security.jail.enforce_statfs is handled by jail_set(2), so handling it in
  userspace jail(8) is redundant.
  
  Differential Revision:	D14791

Modified:
  head/usr.sbin/jail/config.c
  head/usr.sbin/jail/jail.c
  head/usr.sbin/jail/jailp.h

Modified: head/usr.sbin/jail/config.c
==============================================================================
--- head/usr.sbin/jail/config.c	Thu Aug 16 18:27:43 2018	(r337918)
+++ head/usr.sbin/jail/config.c	Thu Aug 16 18:30:49 2018	(r337919)
@@ -106,7 +106,6 @@ static const struct ipspec intparams[] = {
     [KP_ALLOW_SOCKET_AF] =	{"allow.socket_af",	0},
     [KP_ALLOW_SYSVIPC] =	{"allow.sysvipc",	0},
     [KP_DEVFS_RULESET] =	{"devfs_ruleset",	0},
-    [KP_ENFORCE_STATFS] =	{"enforce_statfs",	0},
     [KP_HOST_HOSTNAME] =	{"host.hostname",	0},
 #ifdef INET
     [KP_IP4_ADDR] =		{"ip4.addr",		0},

Modified: head/usr.sbin/jail/jail.c
==============================================================================
--- head/usr.sbin/jail/jail.c	Thu Aug 16 18:27:43 2018	(r337918)
+++ head/usr.sbin/jail/jail.c	Thu Aug 16 18:30:49 2018	(r337919)
@@ -138,7 +138,6 @@ main(int argc, char **argv)
 	unsigned op, pi;
 	int ch, docf, error, i, oldcl, sysval;
 	int dflag, Rflag;
-	char enforce_statfs[4];
 #if defined(INET) || defined(INET6)
 	char *cs, *ncs;
 #endif
@@ -275,14 +274,6 @@ main(int argc, char **argv)
 					    (sysval ? 1 : 0) ^
 					    perm_sysctl[pi].rev
 					    ? NULL : "false");
-			}
-			sysvallen = sizeof(sysval);
-			if (sysctlbyname("security.jail.enforce_statfs",
-			    &sysval, &sysvallen, NULL, 0) == 0) {
-				snprintf(enforce_statfs,
-				    sizeof(enforce_statfs), "%d", sysval);
-				add_param(NULL, NULL, KP_ENFORCE_STATFS,
-				    enforce_statfs);
 			}
 		}
 	} else if (op == JF_STOP) {

Modified: head/usr.sbin/jail/jailp.h
==============================================================================
--- head/usr.sbin/jail/jailp.h	Thu Aug 16 18:27:43 2018	(r337918)
+++ head/usr.sbin/jail/jailp.h	Thu Aug 16 18:30:49 2018	(r337919)
@@ -120,7 +120,6 @@ enum intparam {
 	KP_ALLOW_SOCKET_AF,
 	KP_ALLOW_SYSVIPC,
 	KP_DEVFS_RULESET,
-	KP_ENFORCE_STATFS,
 	KP_HOST_HOSTNAME,
 #ifdef INET
 	KP_IP4_ADDR,