Attachment 593149 Details for Bug 678096 – proposed RHEL-5 patch

[patch] proposed RHEL-5 patch

rhel5.patch (text/plain), 1.25 KB, created by Laszlo Ersek on 2012-06-20 08:18:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Laszlo Ersek

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

Size: 1.25 KB

patch

obsolete

>From 9b238862bd57a98b719728d75269e06414fdee83 Mon Sep 17 00:00:00 2001
>From: Laszlo Ersek <lersek@redhat.com>
>Date: Wed, 20 Jun 2012 10:16:08 +0200
>Subject: [RHEL5.9 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-generic.c |    7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/crypto/padlock-generic.c b/drivers/crypto/padlock-generic.c
>index a7a57f0..38ad610 100644
>--- a/drivers/crypto/padlock-generic.c
>+++ b/drivers/crypto/padlock-generic.c
>@@ -26,12 +26,12 @@ padlock_init(void)
> 	
> 	if (!cpu_has_xcrypt) {
> 		printk(KERN_ERR PFX "VIA PadLock not detected.\n");
>-		return -ENODEV;
>+		return 0;
> 	}
> 
> 	if (!cpu_has_xcrypt_enabled) {
> 		printk(KERN_ERR PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
>-		return -ENODEV;
>+		return 0;
> 	}
> 
> #ifdef CONFIG_CRYPTO_DEV_PADLOCK_AES
>@@ -50,6 +50,9 @@ padlock_init(void)
> static void __exit
> padlock_fini(void)
> {
>+	if (!cpu_has_xcrypt || !cpu_has_xcrypt_enabled)
>+		return;
>+
> #ifdef CONFIG_CRYPTO_DEV_PADLOCK_AES
> 	padlock_fini_aes();
> #endif
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 678096: 593148 | 593149