diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-12-04 18:25:19 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-02-20 00:49:29 +0000 |
| commit | 655f4c99e1b105fe481f254ed1cb7af0ba64f550 (patch) | |
| tree | f7862c95a740c7266adc35febffd71278774d4ef | |
| parent | d143bd76bf12b65e61c55aa42e05a0b51e205077 (diff) | |
| download | linux-stable-655f4c99e1b105fe481f254ed1cb7af0ba64f550.tar.gz linux-stable-655f4c99e1b105fe481f254ed1cb7af0ba64f550.tar.bz2 linux-stable-655f4c99e1b105fe481f254ed1cb7af0ba64f550.zip | |
KEYS: Fix stale key registration at error path
commit b26bdde5bb27f3f900e25a95e33a0c476c8c2c48 upstream.
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
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | security/keys/encrypted-keys/encrypted.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c index 41144f71d615..7c5d1d864c1b 100644 --- a/security/keys/encrypted-keys/encrypted.c +++ b/security/keys/encrypted-keys/encrypted.c @@ -1016,10 +1016,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; |