diff options
author | Oleg Nesterov <oleg@redhat.com> | 2010-05-26 17:43:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 12:12:45 -0400 |
commit | 685bfd2c48bb3284d31e73ff3151c957d76deda9 (patch) | |
tree | 177210787515f48c0eaad5216bd012f4a2fb2149 /security/keys/internal.h | |
parent | 898b374af6f71041bd3bceebe257e564f3f1d458 (diff) |
umh: creds: convert call_usermodehelper_keys() to use subprocess_info->init()
call_usermodehelper_keys() uses call_usermodehelper_setkeys() to change
subprocess_info->cred in advance. Now that we have info->init() we can
change this code to set tgcred->session_keyring in context of execing
kernel thread.
Note: since currently call_usermodehelper_keys() is never called with
UMH_NO_WAIT, call_usermodehelper_keys()->key_get() and umh_keys_cleanup()
are not really needed, we could rely on install_session_keyring_to_cred()
which does key_get() on success.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'security/keys/internal.h')
-rw-r--r-- | security/keys/internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/keys/internal.h b/security/keys/internal.h index 5d4402a1161a..38783dcf6c61 100644 --- a/security/keys/internal.h +++ b/security/keys/internal.h | |||
@@ -124,6 +124,7 @@ extern struct key *find_keyring_by_name(const char *name, bool skip_perm_check); | |||
124 | extern int install_user_keyrings(void); | 124 | extern int install_user_keyrings(void); |
125 | extern int install_thread_keyring_to_cred(struct cred *); | 125 | extern int install_thread_keyring_to_cred(struct cred *); |
126 | extern int install_process_keyring_to_cred(struct cred *); | 126 | extern int install_process_keyring_to_cred(struct cred *); |
127 | extern int install_session_keyring_to_cred(struct cred *, struct key *); | ||
127 | 128 | ||
128 | extern struct key *request_key_and_link(struct key_type *type, | 129 | extern struct key *request_key_and_link(struct key_type *type, |
129 | const char *description, | 130 | const char *description, |