diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2004-10-30 21:06:07 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2004-10-30 21:06:07 +0000 |
| commit | 69769f91f11a53e762f71419a1b4849bbaef07e2 (patch) | |
| tree | eab95de28343c7a922303268e54c93b806220fd9 | |
| parent | 82d4c1675e2d0ff99df2b5ed2fab8c6e74f69cf3 (diff) | |
| download | src-test2-69769f91f11a53e762f71419a1b4849bbaef07e2.tar.gz src-test2-69769f91f11a53e762f71419a1b4849bbaef07e2.zip | |
Merge kern_mac.c:1.114 from HEAD to RELENG_5:
date: 2004/10/30 14:20:59; author: rwatson; state: Exp; lines: +21 -0
Disable use of synchronization early in the boot by the MAC Framework;
for modules linked into the kernel or loaded very early, panics will
result otherwise, as the CV code it calls will panic due to its use
of a mutex before it is initialized.
Approved by: re (kensmith)
Notes
Notes:
svn path=/releng/5.3/; revision=137083
| -rw-r--r-- | sys/kern/kern_mac.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c index db6fc59df598..d2a674944108 100644 --- a/sys/kern/kern_mac.c +++ b/sys/kern/kern_mac.c @@ -188,6 +188,9 @@ mac_policy_grab_exclusive(void) { #ifndef MAC_STATIC + if (!mac_late) + return; + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_policy_grab_exclusive() at %s:%d", __FILE__, __LINE__); mtx_lock(&mac_policy_mtx); @@ -201,6 +204,9 @@ mac_policy_assert_exclusive(void) { #ifndef MAC_STATIC + if (!mac_late) + return; + mtx_assert(&mac_policy_mtx, MA_OWNED); KASSERT(mac_policy_count == 0, ("mac_policy_assert_exclusive(): not exclusive")); @@ -212,6 +218,9 @@ mac_policy_release_exclusive(void) { #ifndef MAC_STATIC + if (!mac_late) + return; + KASSERT(mac_policy_count == 0, ("mac_policy_release_exclusive(): not exclusive")); mtx_unlock(&mac_policy_mtx); @@ -224,6 +233,9 @@ mac_policy_list_busy(void) { #ifndef MAC_STATIC + if (!mac_late) + return; + mtx_lock(&mac_policy_mtx); mac_policy_count++; mtx_unlock(&mac_policy_mtx); @@ -236,6 +248,9 @@ mac_policy_list_conditional_busy(void) #ifndef MAC_STATIC int ret; + if (!mac_late) + return (1); + mtx_lock(&mac_policy_mtx); if (!LIST_EMPTY(&mac_policy_list)) { mac_policy_count++; @@ -245,6 +260,9 @@ mac_policy_list_conditional_busy(void) mtx_unlock(&mac_policy_mtx); return (ret); #else + if (!mac_late) + return (1); + return (1); #endif } @@ -254,6 +272,9 @@ mac_policy_list_unbusy(void) { #ifndef MAC_STATIC + if (!mac_late) + return; + mtx_lock(&mac_policy_mtx); mac_policy_count--; KASSERT(mac_policy_count >= 0, ("MAC_POLICY_LIST_LOCK")); |