Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Dec 2012 21:40:52 +0000 (UTC)
From:      Mateusz Guzik <mjg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r244566 - stable/9/sys/kern
Message-ID:  <201212212140.qBLLeqpU043503@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mjg
Date: Fri Dec 21 21:40:51 2012
New Revision: 244566
URL: http://svnweb.freebsd.org/changeset/base/244566

Log:
  MFC r244404:
  
  prison_racct_detach can be called for not fully initialized jail, so make
  it check that the jail has racct before doing anything
  
  PR:		kern/174436

Modified:
  stable/9/sys/kern/kern_jail.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/kern_jail.c
==============================================================================
--- stable/9/sys/kern/kern_jail.c	Fri Dec 21 21:33:47 2012	(r244565)
+++ stable/9/sys/kern/kern_jail.c	Fri Dec 21 21:40:51 2012	(r244566)
@@ -4533,6 +4533,8 @@ prison_racct_detach(struct prison *pr)
 
 	sx_assert(&allprison_lock, SA_UNLOCKED);
 
+	if (pr->pr_prison_racct == NULL)
+		return;
 	prison_racct_free(pr->pr_prison_racct);
 	pr->pr_prison_racct = NULL;
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212212140.qBLLeqpU043503>