linux-kernel - [PATCH] allow padlock module to load without xcrypt support

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <1340184139-6718-1-git-send-email-lersek@redhat.com>
Date:	Wed, 20 Jun 2012 11:22:19 +0200
From:	Laszlo Ersek <lersek@...hat.com>
To:	linux-kernel@...r.kernel.org, lersek@...hat.com
Subject: [PATCH] allow padlock module to load without xcrypt support

Lack of (enabled) hardware is arguably not a module initialization error,
thus it should not cause problems during the boot process.

Signed-off-by: Laszlo Ersek <lersek@...hat.com>
---
Please CC me on any comments. Thanks.

 drivers/crypto/padlock-aes.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
index 37b2e94..a42a308 100644
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
@@ -516,11 +516,11 @@ static int __init padlock_init(void)
 	struct cpuinfo_x86 *c = &cpu_data(0);
 
 	if (!x86_match_cpu(padlock_cpu_id))
-		return -ENODEV;
+		return 0;
 
 	if (!cpu_has_xcrypt_enabled) {
 		printk(KERN_NOTICE PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
-		return -ENODEV;
+		return 0;
 	}
 
 	if ((ret = crypto_register_alg(&aes_alg)))
@@ -554,6 +554,9 @@ aes_err:
 
 static void __exit padlock_fini(void)
 {
+	if (!x86_match_cpu(padlock_cpu_id) || !cpu_has_xcrypt_enabled)
+		return;
+
 	crypto_unregister_alg(&cbc_aes_alg);
 	crypto_unregister_alg(&ecb_aes_alg);
 	crypto_unregister_alg(&aes_alg);
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/