Date: Thu, 30 Jul 2009 14:28:56 +0000 (UTC) From: Jamie Gritton <jamie@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/sys/kern kern_jail.c Message-ID: <200907301429.n6UETCOG067002@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
jamie 2009-07-30 14:28:56 UTC
FreeBSD src repository
Modified files:
sys/kern kern_jail.c
Log:
SVN rev 195974 on 2009-07-30 14:28:56Z by jamie
Remove a LOR, where the the sleepable allprison_lock was being obtained
in prison_equal_ip4/6 while an inp mutex was held. Locking allprison_lock
can be avoided by making a restriction on the IP addresses associated with
jails:
Don't allow the "ip4" and "ip6" parameters to be changed after a jail is
created. Setting the "ip4.addr" and "ip6.addr" parameters is allowed,
but only if the jail was already created with either ip4/6=new or
ip4/6=disable. With this restriction, the prison flags in question
(PR_IP4_USER and PR_IP6_USER) become read-only and can be checked
without locking.
This also allows the simplification of a messy code path that was needed
to handle an existing prison gaining an IP address list.
PR: kern/136899
Reported by: Dirk Meyer
Approved by: re (kib), bz (mentor)
Revision Changes Path
1.116 +187 -309 src/sys/kern/kern_jail.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907301429.n6UETCOG067002>