Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Oct 2013 05:53:29 +0000 (UTC)
From:      Konstantin Belousov <kib@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: r256075 - stable/9/sys/security/mac
Message-ID:  <201310060553.r965rTIK020963@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kib
Date: Sun Oct  6 05:53:29 2013
New Revision: 256075
URL: http://svnweb.freebsd.org/changeset/base/256075

Log:
  MFC r255945:
  Make the mac_policy_rm lock recursable, which allows reentrance into
  the mac framework.

Modified:
  stable/9/sys/security/mac/mac_framework.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/security/mac/mac_framework.c
==============================================================================
--- stable/9/sys/security/mac/mac_framework.c	Sun Oct  6 05:50:55 2013	(r256074)
+++ stable/9/sys/security/mac/mac_framework.c	Sun Oct  6 05:53:29 2013	(r256075)
@@ -292,7 +292,8 @@ mac_init(void)
 	mac_labelzone_init();
 
 #ifndef MAC_STATIC
-	rm_init_flags(&mac_policy_rm, "mac_policy_rm", RM_NOWITNESS);
+	rm_init_flags(&mac_policy_rm, "mac_policy_rm", RM_NOWITNESS |
+	    RM_RECURSE);
 	sx_init_flags(&mac_policy_sx, "mac_policy_sx", SX_NOWITNESS);
 #endif
 }



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