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>
25 lines
674 B
C
25 lines
674 B
C
/*
|
|
* Copyright (C) 2004-2006 Atmel Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#include <linux/unistd.h>
|
|
|
|
int kernel_execve(const char *file,
|
|
const char *const *argv,
|
|
const char *const *envp)
|
|
{
|
|
register long scno asm("r8") = __NR_execve;
|
|
register long sc1 asm("r12") = (long)file;
|
|
register long sc2 asm("r11") = (long)argv;
|
|
register long sc3 asm("r10") = (long)envp;
|
|
|
|
asm volatile("scall"
|
|
: "=r"(sc1)
|
|
: "r"(scno), "0"(sc1), "r"(sc2), "r"(sc3)
|
|
: "cc", "memory");
|
|
return sc1;
|
|
}
|