From owner-cvs-src@FreeBSD.ORG Thu Dec 6 02:09:03 2007 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CC6F16A417; Thu, 6 Dec 2007 02:09:03 +0000 (UTC) (envelope-from bazerka@beardz.net) Received: from mail.btshosting.co.uk (mail.btshosting.co.uk [213.228.232.37]) by mx1.freebsd.org (Postfix) with ESMTP id 07C1013C46E; Thu, 6 Dec 2007 02:09:02 +0000 (UTC) (envelope-from bazerka@beardz.net) Received: from [192.168.0.3] (host81-154-37-210.range81-154.btcentralplus.com [81.154.37.210]) (authenticated bits=0) by mail.btshosting.co.uk (8.13.8/8.13.8) with ESMTP id lB61cS47015821; Thu, 6 Dec 2007 01:38:28 GMT Message-ID: <4757529A.2090805@beardz.net> Date: Thu, 06 Dec 2007 01:38:34 +0000 From: Jase Thew User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 To: Andrew Thompson References: <200712050122.lB51M3QE076490@repoman.freebsd.org> In-Reply-To: <200712050122.lB51M3QE076490@repoman.freebsd.org> Content-Type: multipart/mixed; boundary="------------070502070107010504080609" X-Virus-Scanned: ClamAV version 0.91.2, clamav-milter version 0.91.2 on 87.117.208.49 X-Virus-Status: Clean Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/kern kern_conf.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: bazerka@beardz.net List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Dec 2007 02:09:03 -0000 This is a multi-part message in MIME format. --------------070502070107010504080609 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Andrew Thompson wrote: > thompsa 2007-12-05 01:22:03 UTC > > FreeBSD src repository > > Modified files: > sys/kern kern_conf.c > Log: > Apply a workaround for the unkillable jail problem where some devices created > within the jail are never freed. si_cred is only used by the MAC framework so > make the cred reference conditional on it being compiled in, this is not a fix > and will need to be reviewed for any new consumers of si_cred. > > This will quell some user complaint when using jails with a default kernel. > > Reviewed by: rwatson > MFC after: 3 days > > Revision Changes Path > 1.209 +2 -0 src/sys/kern/kern_conf.c > _______________________________________________ > cvs-src@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/cvs-src > To unsubscribe, send any mail to "cvs-src-unsubscribe@freebsd.org" > Thanks! I've just tested this change against RELENG_6 ( src/sys/kern/kern_conf.c,v 1.186.2.8 2007/02/27 13:27:06 bms) and it has cured my problem of zombie jails being created when you stop a jail (a la PR kern/89528 ). Regards, Jase. --------------070502070107010504080609 Content-Type: text/plain; name="patch-1.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch-1.diff" --- sys/kern/kern_conf.c.orig 2007-12-05 07:44:18.000000000 +0000 +++ sys/kern/kern_conf.c 2007-12-05 07:44:18.000000000 +0000 @@ -562,9 +562,11 @@ } dev->si_flags |= SI_NAMED; +#ifdef MAC if (cr != NULL) dev->si_cred = crhold(cr); else +#endif dev->si_cred = NULL; dev->si_uid = uid; dev->si_gid = gid; --------------070502070107010504080609--