X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=crypto%2Ftestmgr.c;h=c727fb0cb021595afcfee0d9df271f5558c5f16d;hb=80084632e2abf9968f0a582ef044889c686e2954;hp=7d4acc4492338921dd1307c1cc4d4a252130b36a;hpb=631476d7fd93cc1cde1fc9ea6b3875f8eca79871;p=deliverable%2Flinux.git

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 7d4acc449233..c727fb0cb021 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -35,6 +35,10 @@
 
 #include "internal.h"
 
+static bool notests;
+module_param(notests, bool, 0644);
+MODULE_PARM_DESC(notests, "disable crypto self-tests");
+
 #ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
 
 /* a perfect nop */
@@ -3885,6 +3889,11 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
 	int j;
 	int rc;
 
+	if (!fips_enabled && notests) {
+		printk_once(KERN_INFO "alg: self-tests disabled\n");
+		return 0;
+	}
+
 	alg_test_descs_check_order();
 
 	if ((type & CRYPTO_ALG_TYPE_MASK) == CRYPTO_ALG_TYPE_CIPHER) {