d7627467b7
Make do_execve() take a const filename pointer so that kernel_execve() compiles correctly on ARM: arch/arm/kernel/sys_arm.c:88: warning: passing argument 1 of 'do_execve' discards qualifiers from pointer target type This also requires the argv and envp arguments to be consted twice, once for the pointer array and once for the strings the array points to. This is because do_execve() passes a pointer to the filename (now const) to copy_strings_kernel(). A simpler alternative would be to cast the filename pointer in do_execve() when it's passed to copy_strings_kernel(). do_execve() may not change any of the strings it is passed as part of the argv or envp lists as they are some of them in .rodata, so marking these strings as const should be fine. Further kernel_execve() and sys_execve() need to be changed to match. This has been test built on x86_64, frv, arm and mips. Signed-off-by: David Howells <dhowells@redhat.com> Tested-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
91 lines
1.9 KiB
C
91 lines
1.9 KiB
C
/*
|
|
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#include "linux/stddef.h"
|
|
#include "linux/fs.h"
|
|
#include "linux/smp_lock.h"
|
|
#include "linux/ptrace.h"
|
|
#include "linux/sched.h"
|
|
#include "linux/slab.h"
|
|
#include "asm/current.h"
|
|
#include "asm/processor.h"
|
|
#include "asm/uaccess.h"
|
|
#include "as-layout.h"
|
|
#include "mem_user.h"
|
|
#include "skas.h"
|
|
#include "os.h"
|
|
#include "internal.h"
|
|
|
|
void flush_thread(void)
|
|
{
|
|
void *data = NULL;
|
|
int ret;
|
|
|
|
arch_flush_thread(¤t->thread.arch);
|
|
|
|
ret = unmap(¤t->mm->context.id, 0, STUB_START, 0, &data);
|
|
ret = ret || unmap(¤t->mm->context.id, STUB_END,
|
|
host_task_size - STUB_END, 1, &data);
|
|
if (ret) {
|
|
printk(KERN_ERR "flush_thread - clearing address space failed, "
|
|
"err = %d\n", ret);
|
|
force_sig(SIGKILL, current);
|
|
}
|
|
|
|
__switch_mm(¤t->mm->context.id);
|
|
}
|
|
|
|
void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp)
|
|
{
|
|
set_fs(USER_DS);
|
|
PT_REGS_IP(regs) = eip;
|
|
PT_REGS_SP(regs) = esp;
|
|
}
|
|
|
|
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, ¤t->thread.regs);
|
|
if (error == 0) {
|
|
task_lock(current);
|
|
current->ptrace &= ~PT_DTRACE;
|
|
#ifdef SUBARCH_EXECVE1
|
|
SUBARCH_EXECVE1(¤t->thread.regs.regs);
|
|
#endif
|
|
task_unlock(current);
|
|
}
|
|
return error;
|
|
}
|
|
|
|
long um_execve(const char *file, char __user *__user *argv, char __user *__user *env)
|
|
{
|
|
long err;
|
|
|
|
err = execve1(file, argv, env);
|
|
if (!err)
|
|
UML_LONGJMP(current->thread.exec_buf, 1);
|
|
return err;
|
|
}
|
|
|
|
long sys_execve(const char __user *file, char __user *__user *argv,
|
|
char __user *__user *env)
|
|
{
|
|
long error;
|
|
char *filename;
|
|
|
|
lock_kernel();
|
|
filename = getname(file);
|
|
error = PTR_ERR(filename);
|
|
if (IS_ERR(filename)) goto out;
|
|
error = execve1(filename, argv, env);
|
|
putname(filename);
|
|
out:
|
|
unlock_kernel();
|
|
return error;
|
|
}
|