mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
avr32: sanitize copy_thread(), switch to generic fork/vfork/clone, kill wrappers
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
9ac0800213
commit
584271bcb4
4 changed files with 11 additions and 47 deletions
|
@ -40,6 +40,9 @@
|
||||||
#define __ARCH_WANT_SYS_RT_SIGACTION
|
#define __ARCH_WANT_SYS_RT_SIGACTION
|
||||||
#define __ARCH_WANT_SYS_RT_SIGSUSPEND
|
#define __ARCH_WANT_SYS_RT_SIGSUSPEND
|
||||||
#define __ARCH_WANT_SYS_EXECVE
|
#define __ARCH_WANT_SYS_EXECVE
|
||||||
|
#define __ARCH_WANT_SYS_FORK
|
||||||
|
#define __ARCH_WANT_SYS_VFORK
|
||||||
|
#define __ARCH_WANT_SYS_CLONE
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* "Conditional" syscalls
|
* "Conditional" syscalls
|
||||||
|
|
|
@ -299,11 +299,11 @@ asmlinkage void syscall_return(void);
|
||||||
|
|
||||||
int copy_thread(unsigned long clone_flags, unsigned long usp,
|
int copy_thread(unsigned long clone_flags, unsigned long usp,
|
||||||
unsigned long arg,
|
unsigned long arg,
|
||||||
struct task_struct *p, struct pt_regs *regs)
|
struct task_struct *p, struct pt_regs *unused)
|
||||||
{
|
{
|
||||||
struct pt_regs *childregs = task_pt_regs(p);
|
struct pt_regs *childregs = task_pt_regs(p);
|
||||||
|
|
||||||
if (unlikely(!regs)) {
|
if (unlikely(p->flags & PF_KTHREAD)) {
|
||||||
memset(childregs, 0, sizeof(struct pt_regs));
|
memset(childregs, 0, sizeof(struct pt_regs));
|
||||||
p->thread.cpu_context.r0 = arg;
|
p->thread.cpu_context.r0 = arg;
|
||||||
p->thread.cpu_context.r1 = usp; /* fn */
|
p->thread.cpu_context.r1 = usp; /* fn */
|
||||||
|
@ -311,8 +311,9 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
|
||||||
p->thread.cpu_context.pc = (unsigned long)ret_from_kernel_thread;
|
p->thread.cpu_context.pc = (unsigned long)ret_from_kernel_thread;
|
||||||
childregs->sr = MODE_SUPERVISOR;
|
childregs->sr = MODE_SUPERVISOR;
|
||||||
} else {
|
} else {
|
||||||
*childregs = *regs;
|
*childregs = *current_pt_regs();
|
||||||
childregs->sp = usp;
|
if (usp)
|
||||||
|
childregs->sp = usp;
|
||||||
childregs->r12 = 0; /* Set return value for child */
|
childregs->r12 = 0; /* Set return value for child */
|
||||||
p->thread.cpu_context.pc = (unsigned long)ret_from_fork;
|
p->thread.cpu_context.pc = (unsigned long)ret_from_fork;
|
||||||
}
|
}
|
||||||
|
@ -327,28 +328,6 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* r12-r8 are dummy parameters to force the compiler to use the stack */
|
|
||||||
asmlinkage int sys_fork(struct pt_regs *regs)
|
|
||||||
{
|
|
||||||
return do_fork(SIGCHLD, regs->sp, regs, 0, NULL, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
|
|
||||||
void __user *parent_tidptr, void __user *child_tidptr,
|
|
||||||
struct pt_regs *regs)
|
|
||||||
{
|
|
||||||
if (!newsp)
|
|
||||||
newsp = regs->sp;
|
|
||||||
return do_fork(clone_flags, newsp, regs, 0, parent_tidptr,
|
|
||||||
child_tidptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
asmlinkage int sys_vfork(struct pt_regs *regs)
|
|
||||||
{
|
|
||||||
return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->sp, regs,
|
|
||||||
0, NULL, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This function is supposed to answer the question "who called
|
* This function is supposed to answer the question "who called
|
||||||
* schedule()?"
|
* schedule()?"
|
||||||
|
|
|
@ -32,24 +32,6 @@ __sys_rt_sigreturn:
|
||||||
mov r12, sp
|
mov r12, sp
|
||||||
rjmp sys_rt_sigreturn
|
rjmp sys_rt_sigreturn
|
||||||
|
|
||||||
.global __sys_fork
|
|
||||||
.type __sys_fork,@function
|
|
||||||
__sys_fork:
|
|
||||||
mov r12, sp
|
|
||||||
rjmp sys_fork
|
|
||||||
|
|
||||||
.global __sys_clone
|
|
||||||
.type __sys_clone,@function
|
|
||||||
__sys_clone:
|
|
||||||
mov r8, sp
|
|
||||||
rjmp sys_clone
|
|
||||||
|
|
||||||
.global __sys_vfork
|
|
||||||
.type __sys_vfork,@function
|
|
||||||
__sys_vfork:
|
|
||||||
mov r12, sp
|
|
||||||
rjmp sys_vfork
|
|
||||||
|
|
||||||
.global __sys_mmap2
|
.global __sys_mmap2
|
||||||
.type __sys_mmap2,@function
|
.type __sys_mmap2,@function
|
||||||
__sys_mmap2:
|
__sys_mmap2:
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
sys_call_table:
|
sys_call_table:
|
||||||
.long sys_restart_syscall
|
.long sys_restart_syscall
|
||||||
.long sys_exit
|
.long sys_exit
|
||||||
.long __sys_fork
|
.long sys_fork
|
||||||
.long sys_read
|
.long sys_read
|
||||||
.long sys_write
|
.long sys_write
|
||||||
.long sys_open /* 5 */
|
.long sys_open /* 5 */
|
||||||
|
@ -57,7 +57,7 @@ sys_call_table:
|
||||||
.long sys_dup
|
.long sys_dup
|
||||||
.long sys_pipe
|
.long sys_pipe
|
||||||
.long sys_times
|
.long sys_times
|
||||||
.long __sys_clone
|
.long sys_clone
|
||||||
.long sys_brk /* 45 */
|
.long sys_brk /* 45 */
|
||||||
.long sys_setgid
|
.long sys_setgid
|
||||||
.long sys_getgid
|
.long sys_getgid
|
||||||
|
@ -127,7 +127,7 @@ sys_call_table:
|
||||||
.long sys_newuname
|
.long sys_newuname
|
||||||
.long sys_adjtimex
|
.long sys_adjtimex
|
||||||
.long sys_mprotect
|
.long sys_mprotect
|
||||||
.long __sys_vfork
|
.long sys_vfork
|
||||||
.long sys_init_module /* 115 */
|
.long sys_init_module /* 115 */
|
||||||
.long sys_delete_module
|
.long sys_delete_module
|
||||||
.long sys_quotactl
|
.long sys_quotactl
|
||||||
|
|
Loading…
Reference in a new issue