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

Commit f839bbc5 authored by Brian Gerst's avatar Brian Gerst Committed by H. Peter Anvin
Browse files

x86: Merge sys_clone 



Change 32-bit sys_clone to new PTREGSCALL stub, and merge with 64-bit.

Signed-off-by: default avatarBrian Gerst <brgerst@gmail.com>
LKML-Reference: <1260403316-5679-7-git-send-email-brgerst@gmail.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent f1382f15

arch/x86/include/asm/syscalls.h

+2 −6
Original line number Original line Diff line number Diff line
@@ -25,6 +25,8 @@ int sys_fork(struct pt_regs *); 
int sys_vfork(struct pt_regs *);

int sys_vfork(struct pt_regs *);

long sys_execve(char __user *, char __user * __user *,

long sys_execve(char __user *, char __user * __user *,

		char __user * __user *, struct pt_regs *);

		char __user * __user *, struct pt_regs *);

long sys_clone(unsigned long, unsigned long, void __user *,

	       void __user *, struct pt_regs *);





/* kernel/ldt.c */

/* kernel/ldt.c */

asmlinkage int sys_modify_ldt(int, void __user *, unsigned long);

asmlinkage int sys_modify_ldt(int, void __user *, unsigned long);
@@ -42,9 +44,6 @@ asmlinkage int sys_get_thread_area(struct user_desc __user *); 
/* X86_32 only */

/* X86_32 only */

#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32





/* kernel/process_32.c */

int sys_clone(struct pt_regs *);



/* kernel/signal.c */

/* kernel/signal.c */

asmlinkage int sys_sigsuspend(int, int, old_sigset_t);

asmlinkage int sys_sigsuspend(int, int, old_sigset_t);

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

asmlinkage int sys_sigaction(int, const struct old_sigaction __user *,
@@ -73,9 +72,6 @@ int sys_vm86(unsigned long, unsigned long, struct pt_regs *); 




/* X86_64 only */

/* X86_64 only */

/* kernel/process_64.c */

/* kernel/process_64.c */

asmlinkage long sys_clone(unsigned long, unsigned long,

			  void __user *, void __user *,

			  struct pt_regs *);

long sys_arch_prctl(int, unsigned long);

long sys_arch_prctl(int, unsigned long);





/* kernel/sys_x86_64.c */

/* kernel/sys_x86_64.c */

arch/x86/kernel/entry_32.S

+13 −1
Original line number Original line Diff line number Diff line
@@ -760,7 +760,6 @@ ptregs_##name: \ 




PTREGSCALL1(iopl)

PTREGSCALL1(iopl)

PTREGSCALL0(fork)

PTREGSCALL0(fork)

PTREGSCALL0(clone)

PTREGSCALL0(vfork)

PTREGSCALL0(vfork)

PTREGSCALL3(execve)

PTREGSCALL3(execve)

PTREGSCALL2(sigaltstack)

PTREGSCALL2(sigaltstack)
@@ -769,6 +768,19 @@ PTREGSCALL0(rt_sigreturn) 
PTREGSCALL2(vm86)

PTREGSCALL2(vm86)

PTREGSCALL1(vm86old)

PTREGSCALL1(vm86old)





/* Clone is an oddball.  The 4th arg is in %edi */

	ALIGN;

ptregs_clone:

	leal 4(%esp),%eax

	pushl %eax

	pushl PT_EDI(%eax)

	movl PT_EDX(%eax),%ecx

	movl PT_ECX(%eax),%edx

	movl PT_EBX(%eax),%eax

	call sys_clone

	addl $8,%esp

	ret



.macro FIXUP_ESPFIX_STACK

.macro FIXUP_ESPFIX_STACK

/*

/*

 * Switch back for ESPFIX stack to the normal zerobased stack

 * Switch back for ESPFIX stack to the normal zerobased stack

arch/x86/kernel/process.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -234,6 +234,15 @@ int sys_vfork(struct pt_regs *regs) 
		       NULL, NULL);

		       NULL, NULL);

}

}





long

sys_clone(unsigned long clone_flags, unsigned long newsp,

	  void __user *parent_tid, void __user *child_tid, struct pt_regs *regs)

{

	if (!newsp)

		newsp = regs->sp;

	return do_fork(clone_flags, newsp, regs, 0, parent_tid, child_tid);

}







/*

/*

 * sys_execve() executes a new program.

 * sys_execve() executes a new program.

arch/x86/kernel/process_32.c

+0 −15
Original line number Original line Diff line number Diff line
@@ -436,21 +436,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) 
	return prev_p;

	return prev_p;

}

}





int sys_clone(struct pt_regs *regs)

{

	unsigned long clone_flags;

	unsigned long newsp;

	int __user *parent_tidptr, *child_tidptr;



	clone_flags = regs->bx;

	newsp = regs->cx;

	parent_tidptr = (int __user *)regs->dx;

	child_tidptr = (int __user *)regs->di;

	if (!newsp)

		newsp = regs->sp;

	return do_fork(clone_flags, newsp, regs, 0, parent_tidptr, child_tidptr);

}



#define top_esp                (THREAD_SIZE - sizeof(unsigned long))

#define top_esp                (THREAD_SIZE - sizeof(unsigned long))

#define top_ebp                (THREAD_SIZE - 2*sizeof(unsigned long))

#define top_ebp                (THREAD_SIZE - 2*sizeof(unsigned long))

arch/x86/kernel/process_64.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -534,15 +534,6 @@ void set_personality_64bit(void) 
	current->personality &= ~READ_IMPLIES_EXEC;

	current->personality &= ~READ_IMPLIES_EXEC;

}

}





asmlinkage long

sys_clone(unsigned long clone_flags, unsigned long newsp,

	  void __user *parent_tid, void __user *child_tid, struct pt_regs *regs)

{

	if (!newsp)

		newsp = regs->sp;

	return do_fork(clone_flags, newsp, regs, 0, parent_tid, child_tid);

}



unsigned long get_wchan(struct task_struct *p)

unsigned long get_wchan(struct task_struct *p)

{

{

	unsigned long stack;

	unsigned long stack;