[PATCH] introduce kernel_execve function to replace __KERNEL_SYSCALLS__

Arnd Bergmann
2006-08-20T17:13:56Z

On Sunday 20 August 2006 15:47, Björn Steinbrink wrote:
> How is execve() supposed to use the local errno? The kernel syscall
> macro only "creates" a function, so you still need a global errno for
> that code, don't you?

Right, I got confused by the macro referencing it. As an alternative,
you can have a static errno variable in the source file that defines
kernel_execve.

> And I (because I'm clueless ;) wonder about the calls to set_fs(), why
> do we need them? The current code does not seem to do them. Or is there
> something special about kernel_execve that I'm missing? cscope and grep
> didn't tell anything and Google had only a few useless results for
> kernel_execve.

You need to do set_fs if you want to pass a kernel pointer to a function
expecting a __user pointer (like 'char __user *argv[]'). I guess every
place in the kernel where we do call execve actually is running in a
set_fs(KERNEL_DS) environment already and anything else would not
make too much sense. Maybe adding a small check in there to make sure
we're really running in kernel space is better then.

---

Iit turned out most of the architectures that already implement
their own execve() call instead of using the _syscall3 function
for it end up passing the return value of sys_execve down,
instead of setting errno.

The patch below converts those functions to a new kernel_execve
variant and provides a lib/execve.c file with an alternative
implementation for the architectures that are using the traditional
__KERNEL_SYSCALLS__ mechanism for it. It also removes the kernel
syscalls implementation on the architectures that no longer need
it.

The architectures that this patch doesn't touch should ideally
introduce their own kernel_execve() function to get rid of
__KERNEL_SYSCALLS__ as well.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
Tested-on: i386
Compiled-on: i386, powerpc

arch/alpha/Kconfig | 3 +
arch/alpha/kernel/entry.S | 10 ++--
arch/arm/Kconfig | 3 +
arch/arm/kernel/sys_arm.c | 4 -
arch/arm26/Kconfig | 3 +
arch/arm26/kernel/sys_arm.c | 2
arch/ia64/Kconfig | 3 +
arch/ia64/kernel/entry.S | 4 -
arch/parisc/Kconfig | 3 +
arch/parisc/kernel/process.c | 9 +++-
arch/powerpc/Kconfig | 3 +
arch/powerpc/kernel/misc_32.S | 2
arch/powerpc/kernel/misc_64.S | 2
arch/sparc64/kernel/power.c | 5 --
arch/um/Kconfig | 3 +
arch/um/kernel/syscall.c | 13 ++++++
arch/x86_64/Kconfig | 3 +
arch/x86_64/kernel/entry.S | 4 -
drivers/sbus/char/bbc_envctrl.c | 5 --
drivers/sbus/char/envctrl.c | 5 --
include/asm-alpha/unistd.h | 69 ----------------------------------
include/asm-arm/unistd.h | 24 -----------
include/asm-arm26/unistd.h | 24 -----------
include/asm-ia64/unistd.h | 72 -----------------------------------
include/asm-parisc/unistd.h | 79 ---------------------------------------
include/asm-powerpc/unistd.h | 7 ---
include/asm-um/unistd.h | 27 -------------
include/asm-x86_64/unistd.h | 81 ----------------------------------------
include/linux/syscalls.h | 2
init/do_mounts_initrd.c | 3 -
init/main.c | 4 -
kernel/kmod.c | 5 --
lib/Makefile | 4 +
lib/execve.c | 19 +++++++++
34 files changed, 92 insertions(+), 417 deletions(-)

Index: linux-cg/init/do_mounts_initrd.c
===================================================================
--- linux-cg.orig/init/do_mounts_initrd.c 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/init/do_mounts_initrd.c 2006-08-20 19:06:00.000000000 +0200
@@ -1,4 +1,3 @@
-#define __KERNEL_SYSCALLS__
#include <linux/unistd.h>
#include <linux/kernel.h>
#include <linux/fs.h>
@@ -35,7 +34,7 @@
(void) sys_open("/dev/console",O_RDWR,0);
(void) sys_dup(0);
(void) sys_dup(0);
- return execve(shell, argv, envp_init);
+ return kernel_execve(shell, argv, envp_init);
}

static void __init handle_initrd(void)
Index: linux-cg/kernel/kmod.c
===================================================================
--- linux-cg.orig/kernel/kmod.c 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/kernel/kmod.c 2006-08-20 19:06:00.000000000 +0200
@@ -18,8 +18,6 @@
call_usermodehelper wait flag, and remove exec_usermodehelper.
Rusty Russell <rusty@rustcorp.com.au> Jan 2003
*/
-#define __KERNEL_SYSCALLS__
-
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/syscalls.h>
@@ -150,7 +148,8 @@

retval = -EPERM;
if (current->fs->root)
- retval = execve(sub_info->path, sub_info->argv,sub_info->envp);
+ retval = kernel_execve(sub_info->path,
+ sub_info->argv, sub_info->envp);

/* Exec failed? */
sub_info->retval = retval;
Index: linux-cg/lib/Makefile
===================================================================
--- linux-cg.orig/lib/Makefile 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/lib/Makefile 2006-08-20 19:06:00.000000000 +0200
@@ -33,6 +33,10 @@
lib-y += dec_and_lock.o
endif

+ifneq ($(CONFIG_HAVE_KERNEL_EXECVE),y)
+ lib-y += execve.o
+endif
+
obj-$(CONFIG_CRC_CCITT) += crc-ccitt.o
obj-$(CONFIG_CRC16) += crc16.o
obj-$(CONFIG_CRC32) += crc32.o
Index: linux-cg/lib/execve.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-cg/lib/execve.c 2006-08-20 19:06:00.000000000 +0200
@@ -0,0 +1,19 @@
+#include <asm/bug.h>
+#include <asm/uaccess.h>
+
+#define __KERNEL_SYSCALLS__
+static int errno;
+#include <asm/unistd.h>
+
+int kernel_execve(const char *filename, char *const argv[], char *const envp[])
+{
+ mm_segment_t fs = get_fs();
+ int ret;
+
+ WARN_ON(segment_eq(fs, USER_DS));
+ ret = execve(filename, (char **)argv, (char **)envp);
+ if (ret)
+ ret = errno;
+
+ return ret;
+}
Index: linux-cg/init/main.c
===================================================================
--- linux-cg.orig/init/main.c 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/init/main.c 2006-08-20 19:06:00.000000000 +0200
@@ -9,8 +9,6 @@
* Simplified starting of init: Michael A. Griffith <grif@acm.org>
*/

-#define __KERNEL_SYSCALLS__
-
#include <linux/types.h>
#include <linux/module.h>
#include <linux/proc_fs.h>
@@ -679,7 +677,7 @@
static void run_init_process(char *init_filename)
{
argv_init[0] = init_filename;
- execve(init_filename, argv_init, envp_init);
+ kernel_execve(init_filename, argv_init, envp_init);
}

static int init(void * unused)
Index: linux-cg/arch/sparc64/kernel/power.c
===================================================================
--- linux-cg.orig/arch/sparc64/kernel/power.c 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/arch/sparc64/kernel/power.c 2006-08-20 19:06:00.000000000 +0200
@@ -4,8 +4,6 @@
* Copyright (C) 1999 David S. Miller (davem@redhat.com)
*/

-#define __KERNEL_SYSCALLS__
-
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
@@ -14,6 +12,7 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/pm.h>
+#include <linux/syscalls.h>

#include <asm/system.h>
#include <asm/auxio.h>
@@ -98,7 +97,7 @@

/* Ok, down we go... */
button_pressed = 0;
- if (execve("/sbin/shutdown", argv, envp) < 0) {
+ if (kernel_execve("/sbin/shutdown", argv, envp) < 0) {
printk("powerd: shutdown execution failed\n");
add_wait_queue(&powerd_wait, &wait);
goto again;
Index: linux-cg/arch/x86_64/kernel/entry.S
===================================================================
--- linux-cg.orig/arch/x86_64/kernel/entry.S 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/arch/x86_64/kernel/entry.S 2006-08-20 19:06:00.000000000 +0200
@@ -1000,7 +1000,7 @@
* do_sys_execve asm fallback arguments:
* rdi: name, rsi: argv, rdx: envp, fake frame on the stack
*/
-ENTRY(execve)
+ENTRY(kernel_execve)
CFI_STARTPROC
FAKE_STACK_FRAME $0
SAVE_ALL
@@ -1013,7 +1013,7 @@
UNFAKE_STACK_FRAME
ret
CFI_ENDPROC
-ENDPROC(execve)
+ENDPROC(kernel_execve)

KPROBE_ENTRY(page_fault)
errorentry do_page_fault
Index: linux-cg/drivers/sbus/char/bbc_envctrl.c
===================================================================
--- linux-cg.orig/drivers/sbus/char/bbc_envctrl.c 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/drivers/sbus/char/bbc_envctrl.c 2006-08-20 19:06:00.000000000 +0200
@@ -4,9 +4,6 @@
* Copyright (C) 2001 David S. Miller (davem@redhat.com)
*/

-#define __KERNEL_SYSCALLS__
-static int errno;
-
#include <linux/kernel.h>
#include <linux/kthread.h>
#include <linux/sched.h>
@@ -200,7 +197,7 @@
printk(KERN_CRIT "kenvctrld: Shutting down the system now.\n");

shutting_down = 1;
- if (execve("/sbin/shutdown", argv, envp) < 0)
+ if (kernel_execve("/sbin/shutdown", argv, envp) < 0)
printk(KERN_CRIT "envctrl: shutdown execution failed\n");
}

Index: linux-cg/drivers/sbus/char/envctrl.c
===================================================================
--- linux-cg.orig/drivers/sbus/char/envctrl.c 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/drivers/sbus/char/envctrl.c 2006-08-20 19:06:00.000000000 +0200
@@ -19,9 +19,6 @@
* Daniele Bellucci <bellucda@tiscali.it>
*/

-#define __KERNEL_SYSCALLS__
-static int errno;
-
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/kthread.h>
@@ -982,7 +979,7 @@

inprog = 1;
printk(KERN_CRIT "kenvctrld: WARNING: Shutting down the system now.\n");
- if (0 > execve("/sbin/shutdown", argv, envp)) {
+ if (0 > kernel_execve("/sbin/shutdown", argv, envp)) {
printk(KERN_CRIT "kenvctrld: WARNING: system shutdown failed!\n");
inprog = 0; /* unlikely to succeed, but we could try again */
}
Index: linux-cg/arch/x86_64/Kconfig
===================================================================
--- linux-cg.orig/arch/x86_64/Kconfig 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/arch/x86_64/Kconfig 2006-08-20 19:07:12.000000000 +0200
@@ -61,6 +61,9 @@
bool
default y

+config HAVE_KERNEL_EXECVE
+ def_bool y
+
config X86_CMPXCHG
bool
default y
Index: linux-cg/include/asm-x86_64/unistd.h
===================================================================
--- linux-cg.orig/include/asm-x86_64/unistd.h 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/include/asm-x86_64/unistd.h 2006-08-20 19:06:00.000000000 +0200
@@ -661,8 +661,6 @@
#define __ARCH_WANT_SYS_TIME
#define __ARCH_WANT_COMPAT_SYS_TIME

-#ifndef __KERNEL_SYSCALLS__
-
#define __syscall "syscall"

#define _syscall0(type,name) \
@@ -744,85 +742,6 @@
__syscall_return(type,__res); \
}

-#else /* __KERNEL_SYSCALLS__ */
-
-#include <linux/syscalls.h>
-#include <asm/ptrace.h>
-
-/*
- * we need this inline - forking from kernel space will result
- * in NO COPY ON WRITE (!!!), until an execve is executed. This
- * is no problem, but for the stack. This is handled by not letting
- * main() use the stack at all after fork(). Thus, no function
- * calls - which means inline code for fork too, as otherwise we
- * would use the stack upon exit from 'fork()'.
- *
- * Actually only pause and fork are needed inline, so that there
- * won't be any messing with the stack from main(), but we define
- * some others too.
- */
-#define __NR__exit __NR_exit
-
-static inline pid_t setsid(void)
-{
- return sys_setsid();
-}
-
-static inline ssize_t write(unsigned int fd, char * buf, size_t count)
-{
- return sys_write(fd, buf, count);
-}
-
-static inline ssize_t read(unsigned int fd, char * buf, size_t count)
-{
- return sys_read(fd, buf, count);
-}
-
-static inline off_t lseek(unsigned int fd, off_t offset, unsigned int origin)
-{
- return sys_lseek(fd, offset, origin);
-}
-
-static inline long dup(unsigned int fd)
-{
- return sys_dup(fd);
-}
-
-/* implemented in asm in arch/x86_64/kernel/entry.S */
-extern int execve(const char *, char * const *, char * const *);
-
-static inline long open(const char * filename, int flags, int mode)
-{
- return sys_open(filename, flags, mode);
-}
-
-static inline long close(unsigned int fd)
-{
- return sys_close(fd);
-}
-
-static inline pid_t waitpid(int pid, int * wait_stat, int flags)
-{
- return sys_wait4(pid, wait_stat, flags, NULL);
-}
-
-extern long sys_mmap(unsigned long addr, unsigned long len,
- unsigned long prot, unsigned long flags,
- unsigned long fd, unsigned long off);
-
-extern int sys_modify_ldt(int func, void *ptr, unsigned long bytecount);
-
-asmlinkage long sys_execve(char *name, char **argv, char **envp,
- struct pt_regs regs);
-asmlinkage long sys_clone(unsigned long clone_flags, unsigned long newsp,
- void *parent_tid, void *child_tid,
- struct pt_regs regs);
-asmlinkage long sys_fork(struct pt_regs regs);
-asmlinkage long sys_vfork(struct pt_regs regs);
-asmlinkage long sys_pipe(int *fildes);
-
-#endif /* __KERNEL_SYSCALLS__ */
-
#ifndef __ASSEMBLY__

#include <linux/linkage.h>
Index: linux-cg/arch/alpha/kernel/entry.S
===================================================================
--- linux-cg.orig/arch/alpha/kernel/entry.S 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/arch/alpha/kernel/entry.S 2006-08-20 19:06:00.000000000 +0200
@@ -655,12 +655,12 @@
.end kernel_thread

/*
- * execve(path, argv, envp)
+ * kernel_execve(path, argv, envp)
*/
.align 4
- .globl execve
- .ent execve
-execve:
+ .globl kernel_execve
+ .ent kernel_execve
+kernel_execve:
/* We can be called from a module. */
ldgp $gp, 0($27)
lda $sp, -(32+SIZEOF_PT_REGS+8)($sp)
@@ -704,7 +704,7 @@

1: lda $sp, 32+SIZEOF_PT_REGS+8($sp)
ret
-.end execve
+.end kernel_execve

\f
/*
Index: linux-cg/arch/arm/kernel/sys_arm.c
===================================================================
--- linux-cg.orig/arch/arm/kernel/sys_arm.c 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/arch/arm/kernel/sys_arm.c 2006-08-20 19:06:00.000000000 +0200
@@ -279,7 +279,7 @@
return error;
}

-long execve(const char *filename, char **argv, char **envp)
+int kernel_execve(const char *filename, char *const argv[], char *const envp[]);
{
struct pt_regs regs;
int ret;
@@ -317,7 +317,7 @@
out:
return ret;
}
-EXPORT_SYMBOL(execve);
+EXPORT_SYMBOL(kernel_execve);

/*
* Since loff_t is a 64 bit type we avoid a lot of ABI hastle
Index: linux-cg/arch/arm26/kernel/sys_arm.c
===================================================================
--- linux-cg.orig/arch/arm26/kernel/sys_arm.c 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/arch/arm26/kernel/sys_arm.c 2006-08-20 19:08:32.000000000 +0200
@@ -283,7 +283,7 @@
}

/* FIXME - see if this is correct for arm26 */
-long execve(const char *filename, char **argv, char **envp)
+int kernel_execve(const char *filename, char *const argv[], char *const envp[]);
{
struct pt_regs regs;
int ret;
@@ -320,4 +320,4 @@
return ret;
}

-EXPORT_SYMBOL(execve);
+EXPORT_SYMBOL(kernel_execve);
Index: linux-cg/arch/powerpc/kernel/misc_32.S
===================================================================
--- linux-cg.orig/arch/powerpc/kernel/misc_32.S 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/arch/powerpc/kernel/misc_32.S 2006-08-20 19:06:00.000000000 +0200
@@ -843,7 +843,7 @@
addi r1,r1,16
blr

-_GLOBAL(execve)
+_GLOBAL(kernel_execve)
li r0,__NR_execve
sc
bnslr
Index: linux-cg/arch/powerpc/kernel/misc_64.S
===================================================================
--- linux-cg.orig/arch/powerpc/kernel/misc_64.S 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/arch/powerpc/kernel/misc_64.S 2006-08-20 19:06:00.000000000 +0200
@@ -556,7 +556,7 @@

#endif /* CONFIG_ALTIVEC */

-_GLOBAL(execve)
+_GLOBAL(kernel_execve)
li r0,__NR_execve
sc
bnslr
Index: linux-cg/arch/um/Kconfig
===================================================================
--- linux-cg.orig/arch/um/Kconfig 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/arch/um/Kconfig 2006-08-20 19:06:00.000000000 +0200
@@ -29,6 +29,9 @@
bool
default y

+config HAVE_KERNEL_EXECVE
+ def_bool y
+
# Used in kernel/irq/manage.c and include/linux/irq.h
config IRQ_RELEASE_METHOD
bool
Index: linux-cg/include/asm-alpha/unistd.h
===================================================================
--- linux-cg.orig/include/asm-alpha/unistd.h 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/include/asm-alpha/unistd.h 2006-08-20 19:06:00.000000000 +0200
@@ -580,75 +580,6 @@
#define __ARCH_WANT_SYS_OLDUMOUNT
#define __ARCH_WANT_SYS_SIGPENDING

-#ifdef __KERNEL_SYSCALLS__
-
-#include <linux/compiler.h>
-#include <linux/types.h>
-#include <linux/string.h>
-#include <linux/signal.h>
-#include <linux/syscalls.h>
-#include <asm/ptrace.h>
-
-static inline long open(const char * name, int mode, int flags)
-{
- return sys_open(name, mode, flags);
-}
-
-static inline long dup(int fd)
-{
- return sys_dup(fd);
-}
-
-static inline long close(int fd)
-{
- return sys_close(fd);
-}
-
-static inline off_t lseek(int fd, off_t off, int whence)
-{
- return sys_lseek(fd, off, whence);
-}
-
-static inline void _exit(int value)
-{
- sys_exit(value);
-}
-
-#define exit(x) _exit(x)
-
-static inline long write(int fd, const char * buf, size_t nr)
-{
- return sys_write(fd, buf, nr);
-}
-
-static inline long read(int fd, char * buf, size_t nr)
-{
- return sys_read(fd, buf, nr);
-}
-
-extern int execve(char *, char **, char **);
-
-static inline long setsid(void)
-{
- return sys_setsid();
-}
-
-static inline pid_t waitpid(int pid, int * wait_stat, int flags)
-{
- return sys_wait4(pid, wait_stat, flags, NULL);
-}
-
-asmlinkage int sys_execve(char *ufilename, char **argv, char **envp,
- unsigned long a3, unsigned long a4, unsigned long a5,
- struct pt_regs regs);
-asmlinkage long sys_rt_sigaction(int sig,
- const struct sigaction __user *act,
- struct sigaction __user *oact,
- size_t sigsetsize,
- void *restorer);
-
-#endif /* __KERNEL_SYSCALLS__ */
-
/* "Conditional" syscalls. What we want is

__attribute__((weak,alias("sys_ni_syscall")))
Index: linux-cg/include/asm-arm/unistd.h
===================================================================
--- linux-cg.orig/include/asm-arm/unistd.h 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/include/asm-arm/unistd.h 2006-08-20 19:06:00.000000000 +0200
@@ -548,30 +548,6 @@
#define __ARCH_WANT_SYS_SOCKETCALL
#endif

-#ifdef __KERNEL_SYSCALLS__
-
-#include <linux/compiler.h>
-#include <linux/types.h>
-#include <linux/syscalls.h>
-
-extern long execve(const char *file, char **argv, char **envp);
-
-struct pt_regs;
-asmlinkage int sys_execve(char *filenamei, char **argv, char **envp,
- struct pt_regs *regs);
-asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
- struct pt_regs *regs);
-asmlinkage int sys_fork(struct pt_regs *regs);
-asmlinkage int sys_vfork(struct pt_regs *regs);
-asmlinkage int sys_pipe(unsigned long *fildes);
-struct sigaction;
-asmlinkage long sys_rt_sigaction(int sig,
- const struct sigaction __user *act,
- struct sigaction __user *oact,
- size_t sigsetsize);
-
-#endif /* __KERNEL_SYSCALLS__ */
-
/*
* "Conditional" syscalls
*
Index: linux-cg/include/asm-arm26/unistd.h
===================================================================
--- linux-cg.orig/include/asm-arm26/unistd.h 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/include/asm-arm26/unistd.h 2006-08-20 19:06:00.000000000 +0200
@@ -463,30 +463,6 @@
#define __ARCH_WANT_SYS_SIGPROCMASK
#define __ARCH_WANT_SYS_RT_SIGACTION

-#ifdef __KERNEL_SYSCALLS__
-
-#include <linux/compiler.h>
-#include <linux/types.h>
-#include <linux/syscalls.h>
-
-extern long execve(const char *file, char **argv, char **envp);
-
-struct pt_regs;
-asmlinkage int sys_execve(char *filenamei, char **argv, char **envp,
- struct pt_regs *regs);
-asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
- struct pt_regs *regs);
-asmlinkage int sys_fork(struct pt_regs *regs);
-asmlinkage int sys_vfork(struct pt_regs *regs);
-asmlinkage int sys_pipe(unsigned long *fildes);
-struct sigaction;
-asmlinkage long sys_rt_sigaction(int sig,
- const struct sigaction __user *act,
- struct sigaction __user *oact,
- size_t sigsetsize);
-
-#endif /* __KERNEL_SYSCALLS__ */
-
/*
* "Conditional" syscalls
*
Index: linux-cg/include/asm-parisc/unistd.h
===================================================================
--- linux-cg.orig/include/asm-parisc/unistd.h 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/include/asm-parisc/unistd.h 2006-08-20 19:06:00.000000000 +0200
@@ -959,85 +959,6 @@
return K_INLINE_SYSCALL(name, 6, arg1, arg2, arg3, arg4, arg5, arg6); \
}

-#ifdef __KERNEL_SYSCALLS__
-
-#include <asm/current.h>
-#include <linux/compiler.h>
-#include <linux/types.h>
-#include <linux/syscalls.h>
-
-static inline pid_t setsid(void)
-{
- return sys_setsid();
-}
-
-static inline int write(int fd, const char *buf, off_t count)
-{
- return sys_write(fd, buf, count);
-}
-
-static inline int read(int fd, char *buf, off_t count)
-{
- return sys_read(fd, buf, count);
-}
-
-static inline off_t lseek(int fd, off_t offset, int count)
-{
- return sys_lseek(fd, offset, count);
-}
-
-static inline int dup(int fd)
-{
- return sys_dup(fd);
-}
-
-static inline int execve(char *filename, char * argv [],
- char * envp[])
-{
- extern int __execve(char *, char **, char **, struct task_struct *);
- return __execve(filename, argv, envp, current);
-}
-
-static inline int open(const char *file, int flag, int mode)
-{
- return sys_open(file, flag, mode);
-}
-
-static inline int close(int fd)
-{
- return sys_close(fd);
-}
-
-static inline void _exit(int exitcode)
-{
- sys_exit(exitcode);
-}
-
-static inline pid_t waitpid(pid_t pid, int *wait_stat, int options)
-{
- return sys_wait4(pid, wait_stat, options, NULL);
-}
-
-asmlinkage unsigned long sys_mmap(unsigned long addr, unsigned long len,
- unsigned long prot, unsigned long flags,
- unsigned long fd, unsigned long offset);
-asmlinkage unsigned long sys_mmap2(unsigned long addr, unsigned long len,
- unsigned long prot, unsigned long flags,
- unsigned long fd, unsigned long pgoff);
-struct pt_regs;
-asmlinkage int sys_execve(struct pt_regs *regs);
-int sys_clone(unsigned long clone_flags, unsigned long usp,
- struct pt_regs *regs);
-int sys_vfork(struct pt_regs *regs);
-int sys_pipe(int *fildes);
-struct sigaction;
-asmlinkage long sys_rt_sigaction(int sig,
- const struct sigaction __user *act,
- struct sigaction __user *oact,
- size_t sigsetsize);
-
-#endif /* __KERNEL_SYSCALLS__ */
-
#endif /* __ASSEMBLY__ */

#undef STR
Index: linux-cg/include/asm-powerpc/unistd.h
===================================================================
--- linux-cg.orig/include/asm-powerpc/unistd.h 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/include/asm-powerpc/unistd.h 2006-08-20 19:06:00.000000000 +0200
@@ -479,13 +479,6 @@
#endif

/*
- * System call prototypes.
- */
-#ifdef __KERNEL_SYSCALLS__
-extern int execve(const char *file, char **argv, char **envp);
-#endif /* __KERNEL_SYSCALLS__ */
-
-/*
* "Conditional" syscalls
*
* What we want is __attribute__((weak,alias("sys_ni_syscall"))),
Index: linux-cg/include/asm-um/unistd.h
===================================================================
--- linux-cg.orig/include/asm-um/unistd.h 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/include/asm-um/unistd.h 2006-08-20 19:06:00.000000000 +0200
@@ -37,33 +37,6 @@
#define __ARCH_WANT_SYS_RT_SIGSUSPEND
#endif

-#ifdef __KERNEL_SYSCALLS__
-
-#include <linux/compiler.h>
-#include <linux/types.h>
-
-static inline int execve(const char *filename, char *const argv[],
- char *const envp[])
-{
- mm_segment_t fs;
- int ret;
-
- fs = get_fs();
- set_fs(KERNEL_DS);
- ret = um_execve(filename, argv, envp);
- set_fs(fs);
-
- if (ret >= 0)
- return ret;
-
- errno = -(long)ret;
- return -1;
-}
-
-int sys_execve(char *file, char **argv, char **env);
-
-#endif /* __KERNEL_SYSCALLS__ */
-
#undef __KERNEL_SYSCALLS__
#include "asm/arch/unistd.h"

Index: linux-cg/include/linux/syscalls.h
===================================================================
--- linux-cg.orig/include/linux/syscalls.h 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/include/linux/syscalls.h 2006-08-20 19:06:00.000000000 +0200
@@ -597,4 +597,6 @@
asmlinkage long sys_set_robust_list(struct robust_list_head __user *head,
size_t len);

+int kernel_execve(const char *filename, char *const argv[], char *const envp[]);
+
#endif
Index: linux-cg/arch/ia64/kernel/entry.S
===================================================================
--- linux-cg.orig/arch/ia64/kernel/entry.S 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/arch/ia64/kernel/entry.S 2006-08-20 19:06:00.000000000 +0200
@@ -492,11 +492,11 @@
br.ret.sptk.many rp
END(prefetch_stack)

-GLOBAL_ENTRY(execve)
+GLOBAL_ENTRY(kernel_execve)
mov r15=__NR_execve // put syscall number in place
break __BREAK_SYSCALL
br.ret.sptk.many rp
-END(execve)
+END(kernel_execve)

GLOBAL_ENTRY(clone)
mov r15=__NR_clone // put syscall number in place
Index: linux-cg/arch/parisc/kernel/process.c
===================================================================
--- linux-cg.orig/arch/parisc/kernel/process.c 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/arch/parisc/kernel/process.c 2006-08-20 19:06:00.000000000 +0200
@@ -368,7 +368,14 @@
return error;
}

-unsigned long
+extern int __execve(const char *filename, char *const argv[],
+ char *const envp[], struct task_struct *task);
+int kernel_execve(const char *filename, char *const argv[], char *const envp[]);
+{
+ return __execve(filename, argv, envp, current);
+}
+
+unsigned long
get_wchan(struct task_struct *p)
{
struct unwind_frame_info info;
Index: linux-cg/arch/um/kernel/syscall.c
===================================================================
--- linux-cg.orig/arch/um/kernel/syscall.c 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/arch/um/kernel/syscall.c 2006-08-20 19:06:00.000000000 +0200
@@ -164,3 +164,16 @@
spin_unlock(&syscall_lock);
return(ret);
}
+
+int kernel_execve(const char *filename, char *const argv[], char *const envp[])
+{
+ mm_segment_t fs;
+ int ret;
+
+ fs = get_fs();
+ set_fs(KERNEL_DS);
+ ret = um_execve(filename, argv, envp);
+ set_fs(fs);
+
+ return ret;
+}
Index: linux-cg/include/asm-ia64/unistd.h
===================================================================
--- linux-cg.orig/include/asm-ia64/unistd.h 2006-08-20 19:05:53.000000000 +0200
+++ linux-cg/include/asm-ia64/unistd.h 2006-08-20 19:06:00.000000000 +0200
@@ -319,78 +319,6 @@

extern long __ia64_syscall (long a0, long a1, long a2, long a3, long a4, long nr);

-#ifdef __KERNEL_SYSCALLS__
-
-#include <linux/compiler.h>
-#include <linux/string.h>
-#include <linux/signal.h>
-#include <asm/ptrace.h>
-#include <linux/stringify.h>
-#include <linux/syscalls.h>
-
-static inline long
-open (const char * name, int mode, int flags)
-{
- return sys_open(name, mode, flags);
-}
-
-static inline long
-dup (int fd)
-{
- return sys_dup(fd);
-}
-
-static inline long
-close (int fd)
-{
- return sys_close(fd);
-}
-
-static inline off_t
-lseek (int fd, off_t off, int whence)
-{
- return sys_lseek(fd, off, whence);
-}
-
-static inline void
-_exit (int value)
-{
- sys_exit(value);
-}
-
-#define exit(x) _exit(x)
-
-static inline long
-write (int fd, const char * buf, size_t nr)
-{
- return sys_write(fd, buf, nr);
-}
-
-static inline long
-read (int fd, char * buf, size_t nr)
-{
- return sys_read(fd, buf, nr);
-}
-
-
-static inline long
-setsid (void)
-{
- return sys_setsid();
-}
-
-static inline pid_t
-waitpid (int pid, int * wait_stat, int flags)
-{
- return sys_wait4(pid, wait_stat, flags, NULL);
-}
-
-
-extern int execve (const char *filename, char *const av[], char *const ep[]);
-extern pid_t clone (unsigned long flags, void *sp);
-
-#endif /* __KERNEL_SYSCALLS__ */
-
asmlinkage unsigned long sys_mmap(
unsigned long addr, unsigned long len,
int prot, int flags,
Index: linux-cg/arch/alpha/Kconfig
===================================================================
--- linux-cg.orig/arch/alpha/Kconfig 2006-08-20 19:06:01.000000000 +0200
+++ linux-cg/arch/alpha/Kconfig 2006-08-20 19:06:02.000000000 +0200
@@ -524,6 +524,9 @@
depends on SMP
default y

+config HAVE_KERNEL_EXECVE
+ def_bool y
+
config NR_CPUS
int "Maximum number of CPUs (2-64)"
range 2 64
Index: linux-cg/arch/arm/Kconfig
===================================================================
--- linux-cg.orig/arch/arm/Kconfig 2006-08-20 19:06:01.000000000 +0200
+++ linux-cg/arch/arm/Kconfig 2006-08-20 19:06:02.000000000 +0200
@@ -77,6 +77,9 @@
config GENERIC_BUST_SPINLOCK
bool

+config HAVE_KERNEL_EXECVE
+ def_bool y
+
config ARCH_MAY_HAVE_PC_FDC
bool

Index: linux-cg/arch/arm26/Kconfig
===================================================================
--- linux-cg.orig/arch/arm26/Kconfig 2006-08-20 19:06:01.000000000 +0200
+++ linux-cg/arch/arm26/Kconfig 2006-08-20 19:06:02.000000000 +0200
@@ -52,6 +52,9 @@
config GENERIC_BUST_SPINLOCK
bool

+config HAVE_KERNEL_EXECVE
+ def_bool y
+
config GENERIC_ISA_DMA
bool

Index: linux-cg/arch/ia64/Kconfig
===================================================================
--- linux-cg.orig/arch/ia64/Kconfig 2006-08-20 19:06:01.000000000 +0200
+++ linux-cg/arch/ia64/Kconfig 2006-08-20 19:06:02.000000000 +0200
@@ -54,6 +54,9 @@
bool
default y

+config HAVE_KERNEL_EXECVE
+ def_bool y
+
config GENERIC_IOMAP
bool
default y
Index: linux-cg/arch/parisc/Kconfig
===================================================================
--- linux-cg.orig/arch/parisc/Kconfig 2006-08-20 19:06:01.000000000 +0200
+++ linux-cg/arch/parisc/Kconfig 2006-08-20 19:06:02.000000000 +0200
@@ -37,6 +37,9 @@
bool
default y

+config HAVE_KERNEL_EXECVE
+ def_bool y
+
config TIME_LOW_RES
bool
depends on SMP
Index: linux-cg/arch/powerpc/Kconfig
===================================================================
--- linux-cg.orig/arch/powerpc/Kconfig 2006-08-20 19:06:01.000000000 +0200
+++ linux-cg/arch/powerpc/Kconfig 2006-08-20 19:06:02.000000000 +0200
@@ -53,6 +53,9 @@
bool
default y

+config HAVE_KERNEL_EXECVE
+ def_bool y
+
config PPC
bool
default y
Index: linux-cg/arch/alpha/kernel/alpha_ksyms.c
===================================================================
--- linux-cg.orig/arch/alpha/kernel/alpha_ksyms.c 2006-08-20 19:09:47.000000000 +0200
+++ linux-cg/arch/alpha/kernel/alpha_ksyms.c 2006-08-20 19:09:48.000000000 +0200
@@ -116,7 +116,7 @@
EXPORT_SYMBOL(sys_exit);
EXPORT_SYMBOL(sys_write);
EXPORT_SYMBOL(sys_lseek);
-EXPORT_SYMBOL(execve);
+EXPORT_SYMBOL(kernel_execve);
EXPORT_SYMBOL(sys_setsid);
EXPORT_SYMBOL(sys_wait4);