Attachment 615931 Details for Bug 908163

[patch] test fix patch

0001-KEYS-Fix-stale-key-registration-at-error-path.patch (text/plain), 1.25 KB, created by Takashi Iwai on 2014-12-04 16:31:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Iwai

Created: 2014-12-04 16:31:58 UTC

Size: 1.25 KB

patch

obsolete

>From 44e2a5fa1df672a4a8da9331098fe77ef1b792b8 Mon Sep 17 00:00:00 2001
>From: Takashi Iwai <tiwai@suse.de>
>Date: Thu, 4 Dec 2014 17:21:17 +0100
>Subject: [PATCH] KEYS: Fix stale key registration at error path
>
>When loading encrypted-keys module, if the last check of
>aes_get_sizes() in init_encrypted() fails, the driver just returns an
>error without unregistering its key type.  This results in the stale
>entry in the list, and the kernel crashes when registering a new key
>type.
>
>This patch does the proper unregistration at the error path.
>
>Signed-off-by: Takashi Iwai <tiwai@suse.de>
>---
> security/keys/encrypted-keys/encrypted.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
>diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
>index db9675db1026..6125f069b91d 100644
>--- a/security/keys/encrypted-keys/encrypted.c
>+++ b/security/keys/encrypted-keys/encrypted.c
>@@ -1020,7 +1020,13 @@ static int __init init_encrypted(void)
> 	ret = register_key_type(&key_type_encrypted);
> 	if (ret < 0)
> 		goto out;
>-	return aes_get_sizes();
>+	ret = aes_get_sizes();
>+	if (ret < 0)
>+		goto unregister;
>+	return 0;
>+
>+unregister:
>+	unregister_key_type(&key_type_encrypted);
> out:
> 	encrypted_shash_release();
> 	return ret;
>-- 
>2.1.3
>

Actions: View | Diff

Attachments on bug 908163: 615740 | 615741 | 615820 | 615875 | 615877 | 615931 | 615932