mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
kmod: convert two call sites to call_usermodehelper_fns()
Both kernel/sys.c && security/keys/request_key.c where inlining the exact same code as call_usermodehelper_fns(); So simply convert these sites to directly use call_usermodehelper_fns(). Signed-off-by: Boaz Harrosh <[email protected]> Cc: Oleg Nesterov <[email protected]> Cc: Tetsuo Handa <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Peter Zijlstra <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
ae3cef7300
commit
81ab6e7b26
2 changed files with 11 additions and 21 deletions
|
|
@ -93,16 +93,9 @@ static void umh_keys_cleanup(struct subprocess_info *info)
|
|||
static int call_usermodehelper_keys(char *path, char **argv, char **envp,
|
||||
struct key *session_keyring, int wait)
|
||||
{
|
||||
gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL;
|
||||
struct subprocess_info *info =
|
||||
call_usermodehelper_setup(path, argv, envp, gfp_mask);
|
||||
|
||||
if (!info)
|
||||
return -ENOMEM;
|
||||
|
||||
call_usermodehelper_setfns(info, umh_keys_init, umh_keys_cleanup,
|
||||
key_get(session_keyring));
|
||||
return call_usermodehelper_exec(info, wait);
|
||||
return call_usermodehelper_fns(path, argv, envp, wait,
|
||||
umh_keys_init, umh_keys_cleanup,
|
||||
key_get(session_keyring));
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue