Attachment 593148 Details for Bug 678096 – proposed upstream patch

[patch] proposed upstream patch

upstream.patch (text/plain), 1.29 KB, created by Laszlo Ersek on 2012-06-20 08:18:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Laszlo Ersek

Created: 2012-06-20 08:18:14 UTC

Size: 1.29 KB

patch

obsolete

>From 72c60191deba642c63aa1e7ab21abfc3119983e8 Mon Sep 17 00:00:00 2001
>From: Laszlo Ersek <lersek@redhat.com>
>Date: Wed, 20 Jun 2012 10:08:03 +0200
>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@redhat.com>
>---
> 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
>

Actions: View | Diff

Attachments on bug 678096: 593148 | 593149