1 files changed, 6 insertions, 2 deletions

diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c
index ecccca03e99bf..4a746e52d33ce 100644
--- a/sys/security/mac/mac_framework.c
+++ b/sys/security/mac/mac_framework.c
@@ -176,6 +176,7 @@ MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage");
 #ifndef MAC_STATIC
 static struct rmlock mac_policy_rm;	/* Non-sleeping entry points. */
 static struct sx mac_policy_sx;		/* Sleeping entry points. */
+static struct rmslock mac_policy_rms;
 #endif
 
 struct mac_policy_list_head mac_policy_list;
@@ -209,7 +210,7 @@ mac_policy_slock_sleep(void)
 	if (!mac_late)
 		return;
 
-	sx_slock(&mac_policy_sx);
+	rms_rlock(&mac_policy_rms);
 #endif
 }
 
@@ -233,7 +234,7 @@ mac_policy_sunlock_sleep(void)
 	if (!mac_late)
 		return;
 
-	sx_sunlock(&mac_policy_sx);
+	rms_runlock(&mac_policy_rms);
 #endif
 }
 
@@ -249,6 +250,7 @@ mac_policy_xlock(void)
 		return;
 
 	sx_xlock(&mac_policy_sx);
+	rms_wlock(&mac_policy_rms);
 	rm_wlock(&mac_policy_rm);
 #endif
 }
@@ -262,6 +264,7 @@ mac_policy_xunlock(void)
 		return;
 
 	rm_wunlock(&mac_policy_rm);
+	rms_wunlock(&mac_policy_rms);
 	sx_xunlock(&mac_policy_sx);
 #endif
 }
@@ -294,6 +297,7 @@ mac_init(void)
 	rm_init_flags(&mac_policy_rm, "mac_policy_rm", RM_NOWITNESS |
 	    RM_RECURSE);
 	sx_init_flags(&mac_policy_sx, "mac_policy_sx", SX_NOWITNESS);
+	rms_init(&mac_policy_rms, "mac_policy_rms");
 #endif
 }