The patch titled Subject: KEYS: split call to call_usermodehelper_fns() has been removed from the -mm tree. Its filename was keys-split-call-to-call_usermodehelper_fns.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Lucas De Marchi <lucas.demarchi@xxxxxxxxxxxxxx> Subject: KEYS: split call to call_usermodehelper_fns() Use call_usermodehelper_setup() + call_usermodehelper_exec() instead of calling call_usermodehelper_fns(). In case there's an OOM in this last function the cleanup function may not be called - in this case we would miss a call to key_put(). Signed-off-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxxxxxxx> Cc: Oleg Nesterov <oleg@xxxxxxxxxx> Acked-by: David Howells <dhowells@xxxxxxxxxx> Acked-by: James Morris <james.l.morris@xxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Cc: "Rafael J. Wysocki" <rjw@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- security/keys/request_key.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff -puN security/keys/request_key.c~keys-split-call-to-call_usermodehelper_fns security/keys/request_key.c --- a/security/keys/request_key.c~keys-split-call-to-call_usermodehelper_fns +++ a/security/keys/request_key.c @@ -93,9 +93,16 @@ static void umh_keys_cleanup(struct subp static int call_usermodehelper_keys(char *path, char **argv, char **envp, struct key *session_keyring, int wait) { - return call_usermodehelper_fns(path, argv, envp, wait, - umh_keys_init, umh_keys_cleanup, - key_get(session_keyring)); + struct subprocess_info *info; + + info = call_usermodehelper_setup(path, argv, envp, GFP_KERNEL, + umh_keys_init, umh_keys_cleanup, + session_keyring); + if (!info) + return -ENOMEM; + + key_get(session_keyring); + return call_usermodehelper_exec(info, wait); } /* _ Patches currently in -mm which might be from lucas.demarchi@xxxxxxxxxxxxxx are origin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html