diff options
| author | James Morris | 2014-12-16 02:49:10 +0100 |
|---|---|---|
| committer | James Morris | 2014-12-16 02:49:10 +0100 |
| commit | d0bffab0439fb7edaee09677b636eef5991e8b80 (patch) | |
| tree | 4437686bf7e9bea8f6444f23850f21a7b9f360a7 /security/keys | |
| parent | Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met (diff) | |
| download | kernel-qcow2-linux-d0bffab0439fb7edaee09677b636eef5991e8b80.tar.gz kernel-qcow2-linux-d0bffab0439fb7edaee09677b636eef5991e8b80.tar.xz kernel-qcow2-linux-d0bffab0439fb7edaee09677b636eef5991e8b80.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
Diffstat (limited to 'security/keys')
| -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 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; |