Commit 97956605 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus-3.6-rc-final' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml 

Pull UML fixes from Richard Weinberger.

* 'for-linus-3.6-rc-final' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Preinclude include/linux/kern_levels.h
  um: Fix IPC on um
  um: kill thread->forking
  um: let signal_delivered() do SIGTRAP on singlestepping into handler
  um: don't leak floating point state and segment registers on execve()
  um: take cleaning singlestep to start_thread()
parents c3a086e6 9429ec96

arch/um/include/asm/processor-generic.h

+0 −9
Original line number Diff line number Diff line
@@ -20,14 +20,6 @@ struct mm_struct; 


struct thread_struct {

	struct task_struct *saved_task;

	/*

	 * This flag is set to 1 before calling do_fork (and analyzed in

	 * copy_thread) to mark that we are begin called from userspace (fork /

	 * vfork / clone), and reset to 0 after. It is left to 0 when called

	 * from kernelspace (i.e. kernel_thread() or fork_idle(),

	 * as of 2.6.11).

	 */

	int forking;

	struct pt_regs regs;

	int singlestep_syscall;

	void *fault_addr;
@@ -58,7 +50,6 @@ struct thread_struct { 


#define INIT_THREAD \

{ \

	.forking		= 0, \

	.regs		   	= EMPTY_REGS,	\

	.fault_addr		= NULL, \

	.prev_sched		= NULL, \

arch/um/include/shared/common-offsets.h

+0 −10
Original line number Diff line number Diff line
@@ -7,16 +7,6 @@ DEFINE(UM_KERN_PAGE_MASK, PAGE_MASK); 
DEFINE(UM_KERN_PAGE_SHIFT, PAGE_SHIFT);

DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);



DEFINE_STR(UM_KERN_EMERG, KERN_EMERG);

DEFINE_STR(UM_KERN_ALERT, KERN_ALERT);

DEFINE_STR(UM_KERN_CRIT, KERN_CRIT);

DEFINE_STR(UM_KERN_ERR, KERN_ERR);

DEFINE_STR(UM_KERN_WARNING, KERN_WARNING);

DEFINE_STR(UM_KERN_NOTICE, KERN_NOTICE);

DEFINE_STR(UM_KERN_INFO, KERN_INFO);

DEFINE_STR(UM_KERN_DEBUG, KERN_DEBUG);

DEFINE_STR(UM_KERN_CONT, KERN_CONT);



DEFINE(UM_ELF_CLASS, ELF_CLASS);

DEFINE(UM_ELFCLASS32, ELFCLASS32);

DEFINE(UM_ELFCLASS64, ELFCLASS64);

arch/um/include/shared/user.h

+11 −0
Original line number Diff line number Diff line
@@ -26,6 +26,17 @@ 
extern void panic(const char *fmt, ...)

	__attribute__ ((format (printf, 1, 2)));



/* Requires preincluding include/linux/kern_levels.h */

#define UM_KERN_EMERG	KERN_EMERG

#define UM_KERN_ALERT	KERN_ALERT

#define UM_KERN_CRIT	KERN_CRIT

#define UM_KERN_ERR	KERN_ERR

#define UM_KERN_WARNING	KERN_WARNING

#define UM_KERN_NOTICE	KERN_NOTICE

#define UM_KERN_INFO	KERN_INFO

#define UM_KERN_DEBUG	KERN_DEBUG

#define UM_KERN_CONT	KERN_CONT



#ifdef UML_CONFIG_PRINTK

extern int printk(const char *fmt, ...)

	__attribute__ ((format (printf, 1, 2)));

arch/um/kernel/exec.c

+6 −19
Original line number Diff line number Diff line
@@ -39,34 +39,21 @@ void flush_thread(void) 


void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp)

{

	get_safe_registers(regs->regs.gp, regs->regs.fp);

	PT_REGS_IP(regs) = eip;

	PT_REGS_SP(regs) = esp;

}

EXPORT_SYMBOL(start_thread);



static long execve1(const char *file,

		    const char __user *const __user *argv,

		    const char __user *const __user *env)

{

	long error;



	error = do_execve(file, argv, env, &current->thread.regs);

	if (error == 0) {

		task_lock(current);

	current->ptrace &= ~PT_DTRACE;

#ifdef SUBARCH_EXECVE1

		SUBARCH_EXECVE1(&current->thread.regs.regs);

	SUBARCH_EXECVE1(regs->regs);

#endif

		task_unlock(current);

	}

	return error;

}

EXPORT_SYMBOL(start_thread);



long um_execve(const char *file, const char __user *const __user *argv, const char __user *const __user *env)

{

	long err;



	err = execve1(file, argv, env);

	err = do_execve(file, argv, env, &current->thread.regs);

	if (!err)

		UML_LONGJMP(current->thread.exec_buf, 1);

	return err;
@@ -81,7 +68,7 @@ long sys_execve(const char __user *file, const char __user *const __user *argv, 
	filename = getname(file);

	error = PTR_ERR(filename);

	if (IS_ERR(filename)) goto out;

	error = execve1(filename, argv, env);

	error = do_execve(filename, argv, env, &current->thread.regs);

	putname(filename);

 out:

	return error;

arch/um/kernel/process.c

+4 −4
Original line number Diff line number Diff line
@@ -181,11 +181,12 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, 
		struct pt_regs *regs)

{

	void (*handler)(void);

	int kthread = current->flags & PF_KTHREAD;

	int ret = 0;



	p->thread = (struct thread_struct) INIT_THREAD;



	if (current->thread.forking) {

	if (!kthread) {

	  	memcpy(&p->thread.regs.regs, &regs->regs,

		       sizeof(p->thread.regs.regs));

		PT_REGS_SET_SYSCALL_RETURN(&p->thread.regs, 0);
@@ -195,8 +196,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, 
		handler = fork_handler;



		arch_copy_thread(&current->thread.arch, &p->thread.arch);

	}

	else {

	} else {

		get_safe_registers(p->thread.regs.regs.gp, p->thread.regs.regs.fp);

		p->thread.request.u.thread = current->thread.request.u.thread;

		handler = new_thread_handler;
@@ -204,7 +204,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, 


	new_thread(task_stack_page(p), &p->thread.switch_buf, handler);



	if (current->thread.forking) {

	if (!kthread) {

		clear_flushed_tls(p);



		/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE