Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db74ece9 authored by Jan Blunck's avatar Jan Blunck Committed by Linus Torvalds
Browse files

Dont touch fs_struct in usermodehelper 



This test seems to be unnecessary since we always have rootfs mounted before
calling a usermodehelper.

Signed-off-by: default avatarAndreas Gruenbacher <agruen@suse.de>
Signed-off-by: default avatarJan Blunck <jblunck@suse.de>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarGreg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0d63e4f9

kernel/kmod.c

+1 −4
Original line number Diff line number Diff line
@@ -173,10 +173,7 @@ static int ____call_usermodehelper(void *data) 
	 */

	set_user_nice(current, 0);



	retval = -EPERM;

	if (current->fs->root)

		retval = kernel_execve(sub_info->path,

				sub_info->argv, sub_info->envp);

	retval = kernel_execve(sub_info->path, sub_info->argv, sub_info->envp);



	/* Exec failed? */

	sub_info->retval = retval;