diff options
| author | James Morris | 2014-09-22 14:54:56 +0200 |
|---|---|---|
| committer | James Morris | 2014-09-22 14:54:56 +0200 |
| commit | 35e1efd25a9e7d5cf2884fa23441ab87353849bb (patch) | |
| tree | aa0e546b39fa4d0a434919ff106721dfc3777a3d /security/keys/key.c | |
| parent | Merge branch 'smack-for-3.18' of git://git.gitorious.org/smack-next/kernel in... (diff) | |
| parent | KEYS: Check hex2bin()'s return when generating an asymmetric key ID (diff) | |
| download | kernel-qcow2-linux-35e1efd25a9e7d5cf2884fa23441ab87353849bb.tar.gz kernel-qcow2-linux-35e1efd25a9e7d5cf2884fa23441ab87353849bb.tar.xz kernel-qcow2-linux-35e1efd25a9e7d5cf2884fa23441ab87353849bb.zip | |
Merge tag 'keys-next-20140922' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/keys/key.c')
| -rw-r--r-- | security/keys/key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/key.c b/security/keys/key.c index b90a68c4e2c4..8c0092ca0443 100644 --- a/security/keys/key.c +++ b/security/keys/key.c @@ -799,7 +799,7 @@ key_ref_t key_create_or_update(key_ref_t keyring_ref, } key_ref = ERR_PTR(-EINVAL); - if (!index_key.type->match || !index_key.type->instantiate || + if (!index_key.type->instantiate || (!index_key.description && !index_key.type->preparse)) goto error_put_type; |