projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v3.17' into next
[linux-2.6-block.git]
/
security
/
keys
/
key.c
diff --git
a/security/keys/key.c
b/security/keys/key.c
index 6d0cad16f00265a1dc31d8a0804984040fb47995..e17ba6aefdc0820b6c5c3af7cfc90d4e20094915 100644
(file)
--- 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;