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>
98 lines
2.6 KiB
C
98 lines
2.6 KiB
C
/*
|
|
* Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu>
|
|
* Copyright (C) 2007-2009 PetaLogix
|
|
* Copyright (C) 2007 John Williams <john.williams@petalogix.com>
|
|
*
|
|
* Copyright (C) 2006 Atmark Techno, Inc.
|
|
* Yasushi SHOJI <yashi@atmark-techno.com>
|
|
* Tetsuya OHKAWA <tetsuya@atmark-techno.com>
|
|
*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*/
|
|
|
|
#include <linux/errno.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/syscalls.h>
|
|
#include <linux/sem.h>
|
|
#include <linux/msg.h>
|
|
#include <linux/shm.h>
|
|
#include <linux/stat.h>
|
|
#include <linux/mman.h>
|
|
#include <linux/sys.h>
|
|
#include <linux/ipc.h>
|
|
#include <linux/file.h>
|
|
#include <linux/module.h>
|
|
#include <linux/err.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/semaphore.h>
|
|
#include <linux/uaccess.h>
|
|
#include <linux/unistd.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <asm/syscalls.h>
|
|
|
|
asmlinkage long microblaze_vfork(struct pt_regs *regs)
|
|
{
|
|
return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->r1,
|
|
regs, 0, NULL, NULL);
|
|
}
|
|
|
|
asmlinkage long microblaze_clone(int flags, unsigned long stack, struct pt_regs *regs)
|
|
{
|
|
if (!stack)
|
|
stack = regs->r1;
|
|
return do_fork(flags, stack, regs, 0, NULL, NULL);
|
|
}
|
|
|
|
asmlinkage long microblaze_execve(const char __user *filenamei,
|
|
const char __user *const __user *argv,
|
|
const char __user *const __user *envp,
|
|
struct pt_regs *regs)
|
|
{
|
|
int error;
|
|
char *filename;
|
|
|
|
filename = getname(filenamei);
|
|
error = PTR_ERR(filename);
|
|
if (IS_ERR(filename))
|
|
goto out;
|
|
error = do_execve(filename, argv, envp, regs);
|
|
putname(filename);
|
|
out:
|
|
return error;
|
|
}
|
|
|
|
asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
|
|
unsigned long prot, unsigned long flags,
|
|
unsigned long fd, off_t pgoff)
|
|
{
|
|
if (pgoff & ~PAGE_MASK)
|
|
return -EINVAL;
|
|
|
|
return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff >> PAGE_SHIFT);
|
|
}
|
|
|
|
/*
|
|
* Do a system call from kernel instead of calling sys_execve so we
|
|
* end up with proper pt_regs.
|
|
*/
|
|
int kernel_execve(const char *filename,
|
|
const char *const argv[],
|
|
const char *const envp[])
|
|
{
|
|
register const char *__a __asm__("r5") = filename;
|
|
register const void *__b __asm__("r6") = argv;
|
|
register const void *__c __asm__("r7") = envp;
|
|
register unsigned long __syscall __asm__("r12") = __NR_execve;
|
|
register unsigned long __ret __asm__("r3");
|
|
__asm__ __volatile__ ("brki r14, 0x8"
|
|
: "=r" (__ret), "=r" (__syscall)
|
|
: "1" (__syscall), "r" (__a), "r" (__b), "r" (__c)
|
|
: "r4", "r8", "r9",
|
|
"r10", "r11", "r14", "cc", "memory");
|
|
return __ret;
|
|
}
|