Mercurial > illumos > illumos-gate

changeset 10745:89bfb2b10e30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6889491 DEBUG kernels panic during startup in fips140_actions
author Anthony Scarpino <Anthony.Scarpino@Sun.COM>
date Thu, 08 Oct 2009 14:08:48 -0700
parents 674514c28935
children 5944e0b7fd72
files usr/src/uts/common/crypto/core/kcf.c
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/crypto/core/kcf.c	Thu Oct 08 14:02:27 2009 -0700
+++ b/usr/src/uts/common/crypto/core/kcf.c	Thu Oct 08 14:08:48 2009 -0700
@@ -221,13 +221,15 @@
 		KCF_PROV_REFRELE(pd);
 	}
 
+	/* If we are not in FIPS 140 mode exit */
+	if (global_fips140_mode == FIPS140_MODE_DISABLED)
+		return;
+
 	/* If we in the process of validating FIPS 140, enable it */
-	if (global_fips140_mode != FIPS140_MODE_DISABLED) {
-		mutex_enter(&fips140_mode_lock);
-		global_fips140_mode = FIPS140_MODE_ENABLED;
-		cv_signal(&cv_fips140);
-		mutex_exit(&fips140_mode_lock);
-	}
+	mutex_enter(&fips140_mode_lock);
+	global_fips140_mode = FIPS140_MODE_ENABLED;
+	cv_signal(&cv_fips140);
+	mutex_exit(&fips140_mode_lock);
 
 	verify_unverified_providers();
 }