Merge branch 'master' into for-3.9-async

[firefly-linux-kernel-4.4.55.git] / kernel / kmod.c

diff --git a/kernel/kmod.c b/kernel/kmod.c
index ecd42b484db8cd9fe05cd62c169dcc217c1bfa06..56dd34976d7b0d0ba5526ec2ee00a97e8f1339aa 100644 (file)
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -228,9 +228,9 @@ static int ____call_usermodehelper(void *data)
 
        commit_creds(new);
 
-       retval = kernel_execve(sub_info->path,
-                              (const char *const *)sub_info->argv,
-                              (const char *const *)sub_info->envp);
+       retval = do_execve(sub_info->path,
+                          (const char __user *const __user *)sub_info->argv,
+                          (const char __user *const __user *)sub_info->envp);
        if (!retval)
                return 0;