|
@@ -147,6 +147,9 @@ int __request_module(bool wait, const char *fmt, ...)
|
|
*/
|
|
*/
|
|
WARN_ON_ONCE(wait && current_is_async());
|
|
WARN_ON_ONCE(wait && current_is_async());
|
|
|
|
|
|
|
|
+ if (!modprobe_path[0])
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
va_start(args, fmt);
|
|
va_start(args, fmt);
|
|
ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
|
|
ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
|
|
va_end(args);
|
|
va_end(args);
|
|
@@ -569,14 +572,6 @@ int call_usermodehelper_exec(struct subprocess_info *sub_info, int wait)
|
|
int retval = 0;
|
|
int retval = 0;
|
|
|
|
|
|
helper_lock();
|
|
helper_lock();
|
|
- if (!sub_info->path) {
|
|
|
|
- retval = -EINVAL;
|
|
|
|
- goto out;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (sub_info->path[0] == '\0')
|
|
|
|
- goto out;
|
|
|
|
-
|
|
|
|
if (!khelper_wq || usermodehelper_disabled) {
|
|
if (!khelper_wq || usermodehelper_disabled) {
|
|
retval = -EBUSY;
|
|
retval = -EBUSY;
|
|
goto out;
|
|
goto out;
|