The patch titled
introduce kernel_execve
has been removed from the -mm tree. Its filename is
introduce-kernel_execve.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: introduce kernel_execve
From: Arnd Bergmann <arnd@xxxxxxxx>
The use of execve() in the kernel is dubious, since it relies on the
__KERNEL_SYSCALLS__ mechanism that stores the result in a global errno
variable. As a first step of getting rid of this, change all users to a
global kernel_execve function that returns a proper error code.
This function is a terrible hack, and a later patch removes it again after the
kernel syscalls are gone.
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Richard Henderson <rth@xxxxxxxxxxx>
Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Cc: Ian Molton <spyro@xxxxxxx>
Cc: Mikael Starvik <starvik@xxxxxxxx>
Cc: David Howells <dhowells@xxxxxxxxxx>
Cc: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>
Cc: Hirokazu Takata <takata.hirokazu@xxxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: Kyle McMartin <kyle@xxxxxxxxxxx>
Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Cc: Paul Mundt <lethal@xxxxxxxxxxxx>
Cc: Kazumoto Kojima <kkojima@xxxxxxxxxxxxxx>
Cc: Richard Curnow <rc@xxxxxxxxxx>
Cc: William Lee Irwin III <wli@xxxxxxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Jeff Dike <jdike@xxxxxxxxxxx>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Cc: Miles Bader <uclinux-v850@xxxxxxxxxxxxx>
Cc: Chris Zankel <chris@xxxxxxxxxx>
Cc: "Luck, Tony" <tony.luck@xxxxxxxxx>
Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/sparc64/kernel/power.c | 5 ++---
init/do_mounts_initrd.c | 3 +--
init/main.c | 4 +---
kernel/kmod.c | 5 ++---
lib/Makefile | 2 ++
lib/execve.c | 23 +++++++++++++++++++++++
6 files changed, 31 insertions(+), 11 deletions(-)
diff -puN arch/sparc64/kernel/power.c~introduce-kernel_execve arch/sparc64/kernel/power.c
--- a/arch/sparc64/kernel/power.c~introduce-kernel_execve
+++ a/arch/sparc64/kernel/power.c
@@ -4,8 +4,6 @@
* Copyright (C) 1999 David S. Miller (davem@xxxxxxxxxx)
*/
-#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 @@ again:
/* 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;
diff -puN init/do_mounts_initrd.c~introduce-kernel_execve init/do_mounts_initrd.c
--- a/init/do_mounts_initrd.c~introduce-kernel_execve
+++ a/init/do_mounts_initrd.c
@@ -1,4 +1,3 @@
-#define __KERNEL_SYSCALLS__
#include <linux/unistd.h>
#include <linux/kernel.h>
#include <linux/fs.h>
@@ -35,7 +34,7 @@ static int __init do_linuxrc(void * shel
(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)
diff -puN init/main.c~introduce-kernel_execve init/main.c
--- a/init/main.c~introduce-kernel_execve
+++ a/init/main.c
@@ -9,8 +9,6 @@
* Simplified starting of init: Michael A. Griffith <grif@xxxxxxx>
*/
-#define __KERNEL_SYSCALLS__
-
#include <linux/types.h>
#include <linux/module.h>
#include <linux/proc_fs.h>
@@ -703,7 +701,7 @@ static void do_pre_smp_initcalls(void)
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)
diff -puN kernel/kmod.c~introduce-kernel_execve kernel/kmod.c
--- a/kernel/kmod.c~introduce-kernel_execve
+++ a/kernel/kmod.c
@@ -18,8 +18,6 @@
call_usermodehelper wait flag, and remove exec_usermodehelper.
Rusty Russell <rusty@xxxxxxxxxxxxxxx> Jan 2003
*/
-#define __KERNEL_SYSCALLS__
-
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/syscalls.h>
@@ -169,7 +167,8 @@ static int ____call_usermodehelper(void
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;
diff -puN lib/Makefile~introduce-kernel_execve lib/Makefile
--- a/lib/Makefile~introduce-kernel_execve
+++ a/lib/Makefile
@@ -35,6 +35,8 @@ ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
lib-y += dec_and_lock.o
endif
+lib-y += execve.o
+
obj-$(CONFIG_CRC_CCITT) += crc-ccitt.o
obj-$(CONFIG_CRC16) += crc16.o
obj-$(CONFIG_CRC32) += crc32.o
diff -puN /dev/null lib/execve.c
--- /dev/null
+++ a/lib/execve.c
@@ -0,0 +1,23 @@
+#include <asm/bug.h>
+#include <asm/uaccess.h>
+
+#define __KERNEL_SYSCALLS__
+static int errno __attribute__((unused));
+#include <asm/unistd.h>
+
+#ifdef _syscall3
+int kernel_execve (const char *filename, char *const argv[], char *const envp[])
+ __attribute__((__weak__));
+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;
+}
+#endif
_
Patches currently in -mm which might be from arnd@xxxxxxxx are
origin.patch
powerpc-cell-spidernet-burst-alignment-patch.patch
powerpc-cell-spidernet-low-watermark-patch.patch
powerpc-cell-spidernet-stop-error-printing-patch.patch
powerpc-cell-spidernet-ethtool-i-version-number-info.patch
powerpc-cell-spidernet-ethtool-i-version-number.patch
powerpc-cell-spidernet-refine-locking.patch
swsusp-add-ioctl-for-swap-files-support-fix.patch
dm-support-ioctls-on-mapped-devices.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
