Commit 1ffbed72 authored by Al Viro's avatar Al Viro
Browse files

score: switch to generic sys_execve()



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1856ab6d
Loading
Loading
Loading
Loading
+0 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,6 @@
#define _ASM_SCORE_SYSCALLS_H
#define _ASM_SCORE_SYSCALLS_H


asmlinkage long score_clone(struct pt_regs *regs);
asmlinkage long score_clone(struct pt_regs *regs);
asmlinkage long score_execve(struct pt_regs *regs);
asmlinkage long score_sigaltstack(struct pt_regs *regs);
asmlinkage long score_sigaltstack(struct pt_regs *regs);
asmlinkage long score_rt_sigreturn(struct pt_regs *regs);
asmlinkage long score_rt_sigreturn(struct pt_regs *regs);


+1 −0
Original line number Original line Diff line number Diff line
@@ -4,5 +4,6 @@
#define __ARCH_WANT_SYSCALL_NO_FLAGS
#define __ARCH_WANT_SYSCALL_NO_FLAGS
#define __ARCH_WANT_SYSCALL_OFF_T
#define __ARCH_WANT_SYSCALL_OFF_T
#define __ARCH_WANT_SYSCALL_DEPRECATED
#define __ARCH_WANT_SYSCALL_DEPRECATED
#define __ARCH_WANT_SYS_EXECVE


#include <asm-generic/unistd.h>
#include <asm-generic/unistd.h>
+0 −5
Original line number Original line Diff line number Diff line
@@ -487,11 +487,6 @@ illegal_syscall:
	sw	r9, [r0, PT_R7]
	sw	r9, [r0, PT_R7]
	j	syscall_return
	j	syscall_return


ENTRY(sys_execve)
	mv	r4, r0
	la	r8, score_execve
	br	r8

ENTRY(sys_clone)
ENTRY(sys_clone)
	mv	r4, r0
	mv	r4, r0
	la	r8, score_clone
	la	r8, score_clone
+0 −24
Original line number Original line Diff line number Diff line
@@ -83,27 +83,3 @@ score_vfork(struct pt_regs *regs)
	return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD,
	return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD,
			regs->regs[0], regs, 0, NULL, NULL);
			regs->regs[0], regs, 0, NULL, NULL);
}
}

/*
 * sys_execve() executes a new program.
 * This is called indirectly via a small wrapper
 */
asmlinkage long
score_execve(struct pt_regs *regs)
{
	int error;
	struct filename *filename;

	filename = getname((char __user*)regs->regs[4]);
	error = PTR_ERR(filename);
	if (IS_ERR(filename))
		return error;

	error = do_execve(filename->name,
			  (const char __user *const __user *)regs->regs[5],
			  (const char __user *const __user *)regs->regs[6],
			  regs);

	putname(filename);
	return error;
}