Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-13 00:20:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

score: switch to generic sys_execve()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2012-10-15 15:33:32 -04:00
parent 1856ab6db1
commit 1ffbed7220
4 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/score/include/asm/syscalls.h
View File

@ -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
arch/score/include/asm/unistd.h
View File

@ -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>

5
arch/score/kernel/entry.S
View File

@ -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

24
arch/score/kernel/sys_score.c
View File

@ -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;
}