diff --git a/[refs] b/[refs] index 8661e4c57f72..052471531dc6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6672f76a5a1878d42264c1deba8f1ab52b4618d9 +refs/heads/master: b73a7e76c1eeaa770a41554698917c3c45686a07 diff --git a/trunk/kernel/kmod.c b/trunk/kernel/kmod.c index 11c584cd16b3..49cc4b9c1a8d 100644 --- a/trunk/kernel/kmod.c +++ b/trunk/kernel/kmod.c @@ -165,6 +165,12 @@ static int ____call_usermodehelper(void *data) /* We can run anywhere, unlike our parent keventd(). */ set_cpus_allowed(current, CPU_MASK_ALL); + /* + * Our parent is keventd, which runs with elevated scheduling priority. + * Avoid propagating that into the userspace child. + */ + set_user_nice(current, 0); + retval = -EPERM; if (current->fs->root) retval = kernel_execve(sub_info->path,