lkml.org 
[lkml]   [2014]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] KEYS: Fix stale key registration at error path
From
Date
On Thu, 2014-12-04 at 18:25 +0100, Takashi Iwai wrote: 
> 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. In addition to memory leaks, this leads to a kernel
> crash when registering a new key type later.
>
> This patch fixes the problem by swapping the calls of aes_get_sizes()
> and register_key_type(), and releasing resources properly at the error
> paths.
>
> Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=908163
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

Thanks!

Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>

> ---
> security/keys/encrypted-keys/encrypted.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
> index db9675db1026..7bed4ad7cd76 100644
> --- a/security/keys/encrypted-keys/encrypted.c
> +++ b/security/keys/encrypted-keys/encrypted.c
> @@ -1017,10 +1017,13 @@ static int __init init_encrypted(void)
> ret = encrypted_shash_alloc();
> if (ret < 0)
> return ret;
> + ret = aes_get_sizes();
> + if (ret < 0)
> + goto out;
> ret = register_key_type(&key_type_encrypted);
> if (ret < 0)
> goto out;
> - return aes_get_sizes();
> + return 0;
> out:
> encrypted_shash_release();
> return ret;




\
 
 \ /
  Last update: 2014-12-04 23:41    [W:0.080 / U:3.224 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site