diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 16:54:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 16:54:43 -0400 |
| commit | a890b15c0990cc8d686edcc85f5fccde71ad5ce9 (patch) | |
| tree | 73162355b58283a2531f13fbbf663809f95c1483 /security/keys/keyring.c | |
| parent | 79fa1b677be3a985cc66b9218a4dd09818f1051b (diff) | |
| parent | 26ec634c31a11a003040e10b4d650495158632fd (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'security/keys/keyring.c')
| -rw-r--r-- | security/keys/keyring.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index d65a180f888d..bffa924c1f88 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c | |||
| @@ -437,6 +437,7 @@ EXPORT_SYMBOL(keyring_search); | |||
| 437 | /* | 437 | /* |
| 438 | * search the given keyring only (no recursion) | 438 | * search the given keyring only (no recursion) |
| 439 | * - keyring must be locked by caller | 439 | * - keyring must be locked by caller |
| 440 | * - caller must guarantee that the keyring is a keyring | ||
| 440 | */ | 441 | */ |
| 441 | key_ref_t __keyring_search_one(key_ref_t keyring_ref, | 442 | key_ref_t __keyring_search_one(key_ref_t keyring_ref, |
| 442 | const struct key_type *ktype, | 443 | const struct key_type *ktype, |