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

security.jail.enforce_statfs is handled by jail_set(2), so handling it in

Browse Source 
userspace jail(8) is redundant.

Differential Revision:	D14791
This commit is contained in:
Jamie Gritton 2018-08-16 18:30:49 +00:00
parent 25eeb3ea95
commit 07ebf3dd69
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,6 @@ static const struct ipspec intparams[] = {
[KP_ALLOW_SOCKET_AF] = {"allow.socket_af", 0}, [KP_ALLOW_SOCKET_AF] = {"allow.socket_af", 0},
[KP_ALLOW_SYSVIPC] = {"allow.sysvipc", 0}, [KP_ALLOW_SYSVIPC] = {"allow.sysvipc", 0},
[KP_DEVFS_RULESET] = {"devfs_ruleset", 0}, [KP_DEVFS_RULESET] = {"devfs_ruleset", 0},
[KP_ENFORCE_STATFS] = {"enforce_statfs", 0},
[KP_HOST_HOSTNAME] = {"host.hostname", 0}, [KP_HOST_HOSTNAME] = {"host.hostname", 0},
#ifdef INET #ifdef INET
[KP_IP4_ADDR] = {"ip4.addr", 0}, [KP_IP4_ADDR] = {"ip4.addr", 0},

9
usr.sbin/jail/jail.c
View File

@ -138,7 +138,6 @@ main(int argc, char **argv)
unsigned op, pi; unsigned op, pi;
int ch, docf, error, i, oldcl, sysval; int ch, docf, error, i, oldcl, sysval;
int dflag, Rflag; int dflag, Rflag;
char enforce_statfs[4];
#if defined(INET) || defined(INET6) #if defined(INET) || defined(INET6)
char *cs, *ncs; char *cs, *ncs;
#endif #endif
@ -276,14 +275,6 @@ main(int argc, char **argv)
perm_sysctl[pi].rev perm_sysctl[pi].rev
? NULL : "false"); ? 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) { } else if (op == JF_STOP) {
/* Jail remove, perhaps using the config file */ /* Jail remove, perhaps using the config file */

1
usr.sbin/jail/jailp.h
View File

@ -120,7 +120,6 @@ enum intparam {
KP_ALLOW_SOCKET_AF, KP_ALLOW_SOCKET_AF,
KP_ALLOW_SYSVIPC, KP_ALLOW_SYSVIPC,
KP_DEVFS_RULESET, KP_DEVFS_RULESET,
KP_ENFORCE_STATFS,
KP_HOST_HOSTNAME, KP_HOST_HOSTNAME,
#ifdef INET #ifdef INET
KP_IP4_ADDR, KP_IP4_ADDR,