diff options
author | Jamie Gritton <jamie@FreeBSD.org> | 2018-08-16 18:40:16 +0000 |
---|---|---|
committer | Jamie Gritton <jamie@FreeBSD.org> | 2018-08-16 18:40:16 +0000 |
commit | 284001a222ae071c063920aa1c1b6477f168002d (patch) | |
tree | 10ee709c397d09f7bbe58bae03f7543dbe01998b /sys/kern/systrace_args.c | |
parent | a8e44f4da0e8b8892688d88a8faea5abfff2219e (diff) | |
download | src-284001a222ae071c063920aa1c1b6477f168002d.tar.gz src-284001a222ae071c063920aa1c1b6477f168002d.zip |
Put jail(2) under COMPAT_FREEBSD11. It has been the "old" way of creating
jails since FreeBSD 7.
Along with the system call, put the various security.jail.allow_foo and
security.jail.foo_allowed sysctls partly under COMPAT_FREEBSD11 (or
BURN_BRIDGES). These sysctls had two disparate uses: on the system side,
they were global permissions for jails created via jail(2) which lacked
fine-grained permission controls; inside a jail, they're read-only
descriptions of what the current jail is allowed to do. The first use
is obsolete along with jail(2), but keep them for the second-read-only use.
Differential Revision: D14791
Notes
Notes:
svn path=/head/; revision=337922
Diffstat (limited to 'sys/kern/systrace_args.c')
-rw-r--r-- | sys/kern/systrace_args.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index b1286261f56d..f5547759ebc4 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -1593,13 +1593,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) *n_args = 3; break; } - /* jail */ - case 338: { - struct jail_args *p = params; - uarg[0] = (intptr_t) p->jail; /* struct jail * */ - *n_args = 1; - break; - } /* nnpfs_syscall */ case 339: { struct nnpfs_syscall_args *p = params; @@ -5772,16 +5765,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; - /* jail */ - case 338: - switch(ndx) { - case 0: - p = "userland struct jail *"; - break; - default: - break; - }; - break; /* nnpfs_syscall */ case 339: switch(ndx) { @@ -9647,11 +9630,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; - /* jail */ - case 338: - if (ndx == 0 || ndx == 1) - p = "int"; - break; /* nnpfs_syscall */ case 339: if (ndx == 0 || ndx == 1) |