diff options
| author | David Howells <dhowells@redhat.com> | 2010-04-30 14:32:39 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-06 22:25:02 +1000 |
| commit | f70e2e06196ad4c1c762037da2f75354f6c16b81 (patch) | |
| tree | 9632a1e655efb684c87f8c7be6d091fbb1a430e7 /security/keys/internal.h | |
| parent | 043b4d40f53131c5f72eca2a46555fe35328a930 (diff) | |
| download | linux-3.10-f70e2e06196ad4c1c762037da2f75354f6c16b81.tar.gz linux-3.10-f70e2e06196ad4c1c762037da2f75354f6c16b81.tar.bz2 linux-3.10-f70e2e06196ad4c1c762037da2f75354f6c16b81.zip | |
KEYS: Do preallocation for __key_link()
Do preallocation for __key_link() so that the various callers in request_key.c
can deal with any errors from this source before attempting to construct a key.
This allows them to assume that the actual linkage step is guaranteed to be
successful.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/keys/internal.h')
| -rw-r--r-- | security/keys/internal.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h index 24ba0307b7a..5d4402a1161 100644 --- a/security/keys/internal.h +++ b/security/keys/internal.h @@ -87,7 +87,16 @@ extern wait_queue_head_t request_key_conswq; extern struct key_type *key_type_lookup(const char *type); extern void key_type_put(struct key_type *ktype); -extern int __key_link(struct key *keyring, struct key *key); +extern int __key_link_begin(struct key *keyring, + const struct key_type *type, + const char *description, + struct keyring_list **_prealloc); +extern int __key_link_check_live_key(struct key *keyring, struct key *key); +extern void __key_link(struct key *keyring, struct key *key, + struct keyring_list **_prealloc); +extern void __key_link_end(struct key *keyring, + struct key_type *type, + struct keyring_list *prealloc); extern key_ref_t __keyring_search_one(key_ref_t keyring_ref, const struct key_type *type, |