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

Commit 80b249b7 authored by Al Viro's avatar Al Viro
Browse files

sh: convert to generic sys_execve() 



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

arch/sh/include/asm/syscalls_32.h

+0 −4
Original line number Diff line number Diff line
@@ -19,10 +19,6 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, 
asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,

			 unsigned long r6, unsigned long r7,

			 struct pt_regs __regs);

asmlinkage int sys_execve(const char __user *ufilename,

			  const char __user *const __user *uargv,

			  const char __user *const __user *uenvp,

			  unsigned long r7, struct pt_regs __regs);

asmlinkage int sys_sigsuspend(old_sigset_t mask);

asmlinkage int sys_sigaction(int sig, const struct old_sigaction __user *act,

			     struct old_sigaction __user *oact);

arch/sh/include/asm/syscalls_64.h

+0 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ asmlinkage int sys_vfork(unsigned long r2, unsigned long r3, 
			 unsigned long r4, unsigned long r5,

			 unsigned long r6, unsigned long r7,

			 struct pt_regs *pregs);

asmlinkage int sys_execve(const char *ufilename, char **uargv,

			  char **uenvp, unsigned long r5,

			  unsigned long r6, unsigned long r7,

			  struct pt_regs *pregs);



/* Misc syscall related bits */

asmlinkage long long do_syscall_trace_enter(struct pt_regs *regs);

arch/sh/include/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
# define __ARCH_WANT_SYS_SIGPENDING

# define __ARCH_WANT_SYS_SIGPROCMASK

# define __ARCH_WANT_SYS_RT_SIGACTION

# define __ARCH_WANT_SYS_EXECVE



/*

 * "Conditional" syscalls

arch/sh/kernel/process_32.c

+0 −23
Original line number Diff line number Diff line
@@ -262,29 +262,6 @@ asmlinkage int sys_vfork(unsigned long r4, unsigned long r5, 
		       0, NULL, NULL);

}



/*

 * sys_execve() executes a new program.

 */

asmlinkage int sys_execve(const char __user *ufilename,

			  const char __user *const __user *uargv,

			  const char __user *const __user *uenvp,

			  unsigned long r7, struct pt_regs __regs)

{

	struct pt_regs *regs = RELOC_HIDE(&__regs, 0);

	int error;

	struct filename *filename;



	filename = getname(ufilename);

	error = PTR_ERR(filename);

	if (IS_ERR(filename))

		goto out;



	error = do_execve(filename->name, uargv, uenvp, regs);

	putname(filename);

out:

	return error;

}



unsigned long get_wchan(struct task_struct *p)

{

	unsigned long pc;

arch/sh/kernel/process_64.c

+0 −25
Original line number Diff line number Diff line
@@ -454,31 +454,6 @@ asmlinkage int sys_vfork(unsigned long r2, unsigned long r3, 
	return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, pregs->regs[15], pregs, 0, 0, 0);

}



/*

 * sys_execve() executes a new program.

 */

asmlinkage int sys_execve(const char *ufilename, char **uargv,

			  char **uenvp, unsigned long r5,

			  unsigned long r6, unsigned long r7,

			  struct pt_regs *pregs)

{

	int error;

	struct filename *filename;



	filename = getname((char __user *)ufilename);

	error = PTR_ERR(filename);

	if (IS_ERR(filename))

		goto out;



	error = do_execve(filename->name,

			  (const char __user *const __user *)uargv,

			  (const char __user *const __user *)uenvp,

			  pregs);

	putname(filename);

out:

	return error;

}



#ifdef CONFIG_FRAME_POINTER

static int in_sh64_switch_to(unsigned long pc)

{