Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe74290d authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Torvalds
Browse files

[PATCH] provide kernel_execve on all architectures 



This adds the new kernel_execve function on all architectures that were using
_syscall3() to implement execve.

The implementation uses code from the _syscall3 macros provided in the
unistd.h header file.  I don't have cross-compilers for any of these
architectures, so the patch is untested with the exception of i386.

Most architectures can probably implement this in a nicer way in assembly or
by combining it with the sys_execve implementation itself, but this should do
it for now.

[bunk@stusta.de: m68knommu build fix]
[markh@osdl.org: build fix]
[bero@arklinux.org: build fix]
[ralf@linux-mips.org: mips fix]
[schwidefsky@de.ibm.com: s390 fix]
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Andi Kleen <ak@muc.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ian Molton <spyro@f2s.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Hirokazu Takata <takata.hirokazu@renesas.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Cc: Richard Curnow <rc@rc0.org.uk>
Cc: William Lee Irwin III <wli@holomorphy.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Miles Bader <uclinux-v850@lsi.nec.co.jp>
Cc: Chris Zankel <chris@zankel.net>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarBernhard Rosenkraenzer <bero@arklinux.org>
Signed-off-by: default avatarMark Haverkamp <markh@osdl.org>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3db03b4a

arch/frv/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ heads-$(CONFIG_MMU) := head-mmu-fr451.o 
extra-y:= head.o init_task.o vmlinux.lds



obj-y := $(heads-y) entry.o entry-table.o break.o switch_to.o kernel_thread.o \

	 process.o traps.o ptrace.o signal.o dma.o \

	 kernel_execve.o process.o traps.o ptrace.o signal.o dma.o \

	 sys_frv.o time.o semaphore.o setup.o frv_ksyms.o \

	 debug-stub.o irq.o sleep.o uaccess.o

arch/frv/kernel/kernel_execve.S

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/* in-kernel program execution

 *

 * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */



#include <linux/linkage.h>

#include <asm/unistd.h>



###############################################################################

#

# 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, char *const argv[], char *const envp[])

#

# On entry: GR8/GR9/GR10: arguments to function

# On return: GR8: syscall return.

#

###############################################################################

	.globl		kernel_execve

	.type		kernel_execve,@function

kernel_execve:

	setlos		__NR_execve,gr7

	tira		gr0,#0

	bralr



	.size		kernel_execve,.-kernel_execve

arch/h8300/kernel/sys_h8300.c

+24 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <asm/cachectl.h>

#include <asm/traps.h>

#include <asm/ipc.h>

#include <asm/unistd.h>



/*

 * sys_pipe() is the normal C calling standard for creating
@@ -280,3 +281,26 @@ asmlinkage void syscall_print(void *dummy,...) 
               ((regs->pc)&0xffffff)-2,regs->orig_er0,regs->er1,regs->er2,regs->er3,regs->er0);

}

#endif



/*

 * 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, char *const argv[], char *const envp[])

{

	register long res __asm__("er0");

	register const char * _a __asm__("er1") = filename;

	register void *_b __asm__("er2") = argv;

	register void *_c __asm__("er3") = envp;

	__asm__ __volatile__ ("mov.l %1,er0\n\t"

			"trapa	#0\n\t"

			: "=r" (res)

			: "g" (__NR_execve),

			  "g" (_a),

			  "g" (_b),

			  "g" (_c)

			: "cc", "memory");

	return res;

}

arch/i386/kernel/sys_i386.c

+15 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/utsname.h>



#include <asm/uaccess.h>

#include <asm/unistd.h>

#include <asm/ipc.h>



/*
@@ -248,3 +249,17 @@ asmlinkage int sys_olduname(struct oldold_utsname __user * name) 


	return error;

}





/*

 * 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, char *const argv[], char *const envp[])

{

	long __res;

	asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx"

	: "=a" (__res)

	: "0" (__NR_execve),"ri" (filename),"c" (argv), "d" (envp) : "memory");

	return __res;

}

arch/m32r/kernel/sys_m32r.c

+20 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include <asm/cachectl.h>

#include <asm/cacheflush.h>

#include <asm/ipc.h>

#include <asm/syscall.h>

#include <asm/unistd.h>



/*

 * sys_tas() - test-and-set
@@ -223,3 +225,21 @@ asmlinkage int sys_cachectl(char *addr, int nbytes, int op) 
	return -ENOSYS;

}



/*

 * 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, char *const argv[], char *const envp[])

{

	register long __scno __asm__ ("r7") = __NR_execve;

	register long __arg3 __asm__ ("r2") = (long)(envp);

	register long __arg2 __asm__ ("r1") = (long)(argv);

	register long __res __asm__ ("r0") = (long)(filename);

	__asm__ __volatile__ (

		"trap #" SYSCALL_VECTOR "|| nop"

		: "=r" (__res)

		: "r" (__scno), "0" (__res), "r" (__arg2),

			"r" (__arg3)

		: "memory");

	return __res;

}