cvs commit: src/sys/kern kern_conf.c

[Jase Thew]

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 at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/cvs-src
> To unsubscribe, send any mail to "cvs-src-unsubscribe at 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.


-------------- next part --------------
--- 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;