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

Commit ab286b21 authored by Al Viro's avatar Al Viro
Browse files

um: take cleaning singlestep to start_thread() 



... assuming it's needed to be done at all

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1cedd692

arch/um/kernel/exec.c

+5 −19
Original line number Diff line number Diff line
@@ -41,32 +41,18 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp) 
{

	PT_REGS_IP(regs) = eip;

	PT_REGS_SP(regs) = esp;

}

EXPORT_SYMBOL(start_thread);



static long execve1(const char *file,

		    const char __user *const __user *argv,

		    const char __user *const __user *env)

{

	long error;



	error = do_execve(file, argv, env, &current->thread.regs);

	if (error == 0) {

		task_lock(current);

	current->ptrace &= ~PT_DTRACE;

#ifdef SUBARCH_EXECVE1

		SUBARCH_EXECVE1(&current->thread.regs.regs);

	SUBARCH_EXECVE1(regs->regs);

#endif

		task_unlock(current);

	}

	return error;

}

EXPORT_SYMBOL(start_thread);



long um_execve(const char *file, const char __user *const __user *argv, const char __user *const __user *env)

{

	long err;



	err = execve1(file, argv, env);

	err = do_execve(file, argv, env, &current->thread.regs);

	if (!err)

		UML_LONGJMP(current->thread.exec_buf, 1);

	return err;
@@ -81,7 +67,7 @@ long sys_execve(const char __user *file, const char __user *const __user *argv, 
	filename = getname(file);

	error = PTR_ERR(filename);

	if (IS_ERR(filename)) goto out;

	error = execve1(filename, argv, env);

	error = do_execve(filename, argv, env, &current->thread.regs);

	putname(filename);

 out:

	return error;