summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_jail.c
diff options
context:
space:
mode:
authorjamie <jamie@FreeBSD.org>2015-01-17 01:16:03 +0000
committerjamie <jamie@FreeBSD.org>2015-01-17 01:16:03 +0000
commitfe94e6fed383e5bf8d3f256c4f4febd9101fe9ee (patch)
tree61967c093b06c7a317b63f7b7b86067f0d9ecba3 /sys/kern/kern_jail.c
parent612ef79eb033fe15748954c3928590149312d47c (diff)
downloadFreeBSD-src-fe94e6fed383e5bf8d3f256c4f4febd9101fe9ee.zip
FreeBSD-src-fe94e6fed383e5bf8d3f256c4f4febd9101fe9ee.tar.gz
MFC r277158:
Don't set prison's pr_ip4s or pr_ip6s to -1. PR: 196474
Diffstat (limited to 'sys/kern/kern_jail.c')
-rw-r--r--sys/kern/kern_jail.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index 2d35a1a..47c68a2 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -799,7 +799,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags)
#ifdef INET
error = vfs_getopt(opts, "ip4.addr", &op, &ip4s);
if (error == ENOENT)
- ip4s = (pr_flags & PR_IP4_DISABLE) ? 0 : -1;
+ ip4s = 0;
else if (error != 0)
goto done_free;
else if (ip4s & (sizeof(*ip4) - 1)) {
@@ -857,7 +857,7 @@ kern_jail_set(struct thread *td, struct uio *optuio, int flags)
#ifdef INET6
error = vfs_getopt(opts, "ip6.addr", &op, &ip6s);
if (error == ENOENT)
- ip6s = (pr_flags & PR_IP6_DISABLE) ? 0 : -1;
+ ip6s = 0;
else if (error != 0)
goto done_free;
else if (ip6s & (sizeof(*ip6) - 1)) {
OpenPOWER on IntegriCloud