1 files changed, 10 insertions, 3 deletions

diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index 4bd6bdb74193..c411f9bb156b 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -93,9 +93,16 @@ 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)
 {
-        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);
 }
 
 /*