Here is a patch that does what Andrew Morton suggested (plus some more
as explained below) .
Patch inline below and also attached in case there is whitespace
damage. Compile tested on i386 with make defconfig; make. If anyone
can test on other arches and provide feedback that'd be great.
Signed-off-by: Parag Warudkar <[email protected]>
- Give i386, x86_64, powerpc and sh a new
CONFIG_ARCH_HAS_SETUP_ADDITIONAL_PAGES
- Create a new include/linux/interp.h which has:
struct linux_binprm;
#ifdef CONFIG_ARCH_HAS_SETUP_ADDITIONAL_PAGES
extern int arch_setup_additional_pages(struct linux_binprm *bprm,
int executable_stack);
#else
static inline int arch_setup_additional_pages(struct linux_binprm *bprm,
int executable_stack)
{
return 0;
}
#endif
- include <linux/interp.h> from binfmt_elf.c and binfmt_aout.c and from
all the files which implement arch_setup_additional_pages().
- Remove the #ifdef ARCH_HAS_SETUP_ADDITIONAL_PAGES from binfmt_elf.c
- Add the call to arch_setup_additional_pages() in binfmt_aout.h.
- EXPORT_SYMBOL(arch_setup_additional_pages) for all arches referred
above - binfmt_aout.c can be built as module on all architectures and
it needs to call arch_setup_additional_pages
- For x86_64 - remove
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
#define arch_setup_additional_pages syscall32_setup_pages
from ia32_binfmt.c and instead use arch_setup_additional_pages as an
exported wrapper over syscall32_setup_pages
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/arch/i386/Kconfig
linux-2.6-wk/arch/i386/Kconfig
--- linux-2.6-us/arch/i386/Kconfig 2007-01-26 18:49:36.000000000 -0500
+++ linux-2.6-wk/arch/i386/Kconfig 2007-01-26 18:56:29.000000000 -0500
@@ -625,6 +625,11 @@
config ARCH_POPULATES_NODE_MAP
def_bool y
+config ARCH_HAS_SETUP_ADDITIONAL_PAGES
+ bool
+ default y
+ depends on X86_32
+
source "mm/Kconfig"
config HIGHPTE
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/arch/i386/kernel/sysenter.c
linux-2.6-wk/arch/i386/kernel/sysenter.c
--- linux-2.6-us/arch/i386/kernel/sysenter.c 2007-01-26 18:49:36.000000000 -0500
+++ linux-2.6-wk/arch/i386/kernel/sysenter.c 2007-01-27 12:40:14.000000000 -0500
@@ -17,6 +17,7 @@
#include <linux/elf.h>
#include <linux/mm.h>
#include <linux/module.h>
+#include <linux/interp.h>
#include <asm/cpufeature.h>
#include <asm/msr.h>
@@ -165,6 +166,7 @@
up_write(&mm->mmap_sem);
return ret;
}
+EXPORT_SYMBOL(arch_setup_additional_pages);
const char *arch_vma_name(struct vm_area_struct *vma)
{
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/arch/powerpc/Kconfig
linux-2.6-wk/arch/powerpc/Kconfig
--- linux-2.6-us/arch/powerpc/Kconfig 2007-01-26 18:49:36.000000000 -0500
+++ linux-2.6-wk/arch/powerpc/Kconfig 2007-01-26 19:01:39.000000000 -0500
@@ -45,6 +45,11 @@
bool
default y
+config ARCH_HAS_SETUP_ADDITIONAL_PAGES
+ bool
+ default y
+ depends on PPC32 || PPC64
+
config ARCH_HAS_ILOG2_U64
bool
default y if 64BIT
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/arch/powerpc/kernel/vdso.c
linux-2.6-wk/arch/powerpc/kernel/vdso.c
--- linux-2.6-us/arch/powerpc/kernel/vdso.c 2007-01-26 18:49:36.000000000 -0500
+++ linux-2.6-wk/arch/powerpc/kernel/vdso.c 2007-01-27 12:39:39.000000000 -0500
@@ -22,6 +22,7 @@
#include <linux/elf.h>
#include <linux/security.h>
#include <linux/bootmem.h>
+#include <linux/interp.h>
#include <asm/pgtable.h>
#include <asm/system.h>
@@ -305,6 +306,7 @@
up_write(&mm->mmap_sem);
return rc;
}
+EXPORT_SYMBOL(arch_setup_additional_pages);
const char *arch_vma_name(struct vm_area_struct *vma)
{
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/arch/sh/Kconfig
linux-2.6-wk/arch/sh/Kconfig
--- linux-2.6-us/arch/sh/Kconfig 2007-01-26 18:49:36.000000000 -0500
+++ linux-2.6-wk/arch/sh/Kconfig 2007-01-26 19:04:00.000000000 -0500
@@ -67,6 +67,11 @@
bool
default n
+config ARCH_HAS_SETUP_ADDITIONAL_PAGES
+ bool
+ default y
+ depends on SUPERH
+
source "init/Kconfig"
menu "System type"
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/arch/sh/kernel/vsyscall/vsyscall.c
linux-2.6-wk/arch/sh/kernel/vsyscall/vsyscall.c
--- linux-2.6-us/arch/sh/kernel/vsyscall/vsyscall.c 2007-01-26
18:49:36.000000000 -0500
+++ linux-2.6-wk/arch/sh/kernel/vsyscall/vsyscall.c 2007-01-27
12:39:15.000000000 -0500
@@ -17,6 +17,7 @@
#include <linux/gfp.h>
#include <linux/module.h>
#include <linux/elf.h>
+#include <linux/interp.h>
/*
* Should the kernel map a VDSO page into processes and pass its
@@ -125,6 +126,7 @@
up_write(&mm->mmap_sem);
return ret;
}
+EXPORT_SYMBOL(arch_setup_additional_pages);
const char *arch_vma_name(struct vm_area_struct *vma)
{
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/arch/x86_64/ia32/ia32_aout.c
linux-2.6-wk/arch/x86_64/ia32/ia32_aout.c
--- linux-2.6-us/arch/x86_64/ia32/ia32_aout.c 2007-01-26
18:49:37.000000000 -0500
+++ linux-2.6-wk/arch/x86_64/ia32/ia32_aout.c 2007-01-27
13:30:08.000000000 -0500
@@ -25,6 +25,7 @@
#include <linux/binfmts.h>
#include <linux/personality.h>
#include <linux/init.h>
+#include <linux/interp.h>
#include <asm/system.h>
#include <asm/uaccess.h>
@@ -410,7 +411,15 @@
send_sig(SIGKILL, current, 0);
return retval;
}
-
+
+ retval = arch_setup_additional_pages(bprm, EXSTACK_DEFAULT);
+
+ if (retval < 0) {
+ /* Someone check-me: is this error path enough? */
+ send_sig(SIGKILL, current, 0);
+ return retval;
+ }
+
current->mm->start_stack =
(unsigned long)create_aout_tables((char __user *)bprm->p, bprm);
/* start thread */
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/arch/x86_64/ia32/ia32_binfmt.c
linux-2.6-wk/arch/x86_64/ia32/ia32_binfmt.c
--- linux-2.6-us/arch/x86_64/ia32/ia32_binfmt.c 2007-01-26
18:49:37.000000000 -0500
+++ linux-2.6-wk/arch/x86_64/ia32/ia32_binfmt.c 2007-01-27
13:23:56.000000000 -0500
@@ -14,6 +14,7 @@
#include <linux/binfmts.h>
#include <linux/mm.h>
#include <linux/security.h>
+#include <linux/interp.h>
#include <asm/segment.h>
#include <asm/ptrace.h>
@@ -307,10 +308,6 @@
static void elf32_init(struct pt_regs *);
-#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
-#define arch_setup_additional_pages syscall32_setup_pages
-extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
-
#include "../../../fs/binfmt_elf.c"
static void elf32_init(struct pt_regs *regs)
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/arch/x86_64/ia32/syscall32.c
linux-2.6-wk/arch/x86_64/ia32/syscall32.c
--- linux-2.6-us/arch/x86_64/ia32/syscall32.c 2007-01-26
18:49:37.000000000 -0500
+++ linux-2.6-wk/arch/x86_64/ia32/syscall32.c 2007-01-27
13:14:53.000000000 -0500
@@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/stringify.h>
#include <linux/security.h>
+#include <linux/interp.h>
#include <asm/proto.h>
#include <asm/tlbflush.h>
#include <asm/ia32_unistd.h>
@@ -75,6 +76,12 @@
return 0;
}
+int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
+{
+ return syscall32_setup_pages(struct linux_binprm *bprm, int exstack);
+}
+EXPORT_SYMBOL(arch_setup_additional_pages);
+
static int __init init_syscall32(void)
{
syscall32_page = (void *)get_zeroed_page(GFP_KERNEL);
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/arch/x86_64/Kconfig
linux-2.6-wk/arch/x86_64/Kconfig
--- linux-2.6-us/arch/x86_64/Kconfig 2007-01-26 18:49:37.000000000 -0500
+++ linux-2.6-wk/arch/x86_64/Kconfig 2007-01-26 18:59:26.000000000 -0500
@@ -398,6 +398,11 @@
def_bool y
depends on NUMA
+config ARCH_HAS_SETUP_ADDITIONAL_PAGES
+ bool
+ default y
+ depends on X86_64
+
config OUT_OF_LINE_PFN_TO_PAGE
def_bool y
depends on DISCONTIGMEM
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/fs/binfmt_aout.c
linux-2.6-wk/fs/binfmt_aout.c
--- linux-2.6-us/fs/binfmt_aout.c 2007-01-26 18:49:39.000000000 -0500
+++ linux-2.6-wk/fs/binfmt_aout.c 2007-01-27 12:22:48.000000000 -0500
@@ -22,6 +22,7 @@
#include <linux/user.h>
#include <linux/slab.h>
#include <linux/binfmts.h>
+#include <linux/interp.h>
#include <linux/personality.h>
#include <linux/init.h>
@@ -269,7 +270,7 @@
unsigned long fd_offset;
unsigned long rlim;
int retval;
-
+ int executable_stack = EXSTACK_DEFAULT;
ex = *((struct exec *) bprm->buf); /* exec-header */
if ((N_MAGIC(ex) != ZMAGIC && N_MAGIC(ex) != OMAGIC &&
N_MAGIC(ex) != QMAGIC && N_MAGIC(ex) != NMAGIC) ||
@@ -432,6 +433,12 @@
}
beyond_if:
set_binfmt(&aout_format);
+
+ retval = arch_setup_additional_pages(bprm, executable_stack);
+ if (retval < 0) {
+ send_sig(SIGKILL, current, 0);
+ return retval;
+ }
retval = set_brk(current->mm->start_brk, current->mm->brk);
if (retval < 0) {
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/fs/binfmt_elf.c
linux-2.6-wk/fs/binfmt_elf.c
--- linux-2.6-us/fs/binfmt_elf.c 2007-01-26 18:49:39.000000000 -0500
+++ linux-2.6-wk/fs/binfmt_elf.c 2007-01-27 11:09:48.000000000 -0500
@@ -38,6 +38,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
#include <linux/random.h>
+#include <linux/interp.h>
#include <linux/elf.h>
#include <asm/uaccess.h>
#include <asm/param.h>
@@ -965,13 +966,11 @@
set_binfmt(&elf_format);
-#ifdef ARCH_HAS_SETUP_ADDITIONAL_PAGES
retval = arch_setup_additional_pages(bprm, executable_stack);
if (retval < 0) {
send_sig(SIGKILL, current, 0);
goto out;
}
-#endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */
compute_creds(bprm);
current->flags &= ~PF_FORKNOEXEC;
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/include/asm-i386/elf.h
linux-2.6-wk/include/asm-i386/elf.h
--- linux-2.6-us/include/asm-i386/elf.h 2007-01-26 18:49:40.000000000 -0500
+++ linux-2.6-wk/include/asm-i386/elf.h 2007-01-27 12:24:35.000000000 -0500
@@ -156,11 +156,6 @@
#define VDSO_ENTRY VDSO_SYM(&__kernel_vsyscall)
-#define ARCH_HAS_SETUP_ADDITIONAL_PAGES
-struct linux_binprm;
-extern int arch_setup_additional_pages(struct linux_binprm *bprm,
- int executable_stack);
-
extern unsigned int vdso_enabled;
#define ARCH_DLINFO \
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/include/asm-powerpc/elf.h
linux-2.6-wk/include/asm-powerpc/elf.h
--- linux-2.6-us/include/asm-powerpc/elf.h 2007-01-26 18:49:40.000000000 -0500
+++ linux-2.6-wk/include/asm-powerpc/elf.h 2007-01-27 12:24:51.000000000 -0500
@@ -266,11 +266,6 @@
extern int icache_bsize;
extern int ucache_bsize;
-/* vDSO has arch_setup_additional_pages */
-#define ARCH_HAS_SETUP_ADDITIONAL_PAGES
-struct linux_binprm;
-extern int arch_setup_additional_pages(struct linux_binprm *bprm,
- int executable_stack);
#define VDSO_AUX_ENT(a,b) NEW_AUX_ENT(a,b);
/*
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/include/asm-sh/elf.h
linux-2.6-wk/include/asm-sh/elf.h
--- linux-2.6-us/include/asm-sh/elf.h 2007-01-26 18:49:40.000000000 -0500
+++ linux-2.6-wk/include/asm-sh/elf.h 2007-01-27 12:25:07.000000000 -0500
@@ -121,12 +121,6 @@
#endif
#ifdef CONFIG_VSYSCALL
-/* vDSO has arch_setup_additional_pages */
-#define ARCH_HAS_SETUP_ADDITIONAL_PAGES
-struct linux_binprm;
-extern int arch_setup_additional_pages(struct linux_binprm *bprm,
- int executable_stack);
-
extern unsigned int vdso_enabled;
extern void __kernel_vsyscall;
diff -urN --exclude='cscope*' --exclude='*git*' --exclude='*.[sSoO]'
--exclude='*.gz' linux-2.6-us/include/linux/interp.h
linux-2.6-wk/include/linux/interp.h
--- linux-2.6-us/include/linux/interp.h 1969-12-31 19:00:00.000000000 -0500
+++ linux-2.6-wk/include/linux/interp.h 2007-01-27 12:13:44.000000000 -0500
@@ -0,0 +1,17 @@
+/* interp.h */
+#ifndef _LINUX_INTERP_H
+#define _LINUX_INTERP_H
+
+struct linux_binprm;
+#ifdef CONFIG_ARCH_HAS_SETUP_ADDITIONAL_PAGES
+extern int arch_setup_additional_pages(struct linux_binprm *bprm,
+ int executable_stack);
+#else
+static inline int arch_setup_additional_pages(struct linux_binprm *bprm,
+ int executable_stack)
+{
+ return 0;
+}
+#endif
+
+#endif /* interp.h */
On Sat, 27 Jan 2007 15:01:51 -0500
"Parag Warudkar" <[email protected]> wrote:
> Here is a patch that does what Andrew Morton suggested (plus some more
> as explained below) .
> Patch inline below and also attached in case there is whitespace
> damage. Compile tested on i386 with make defconfig; make. If anyone
> can test on other arches and provide feedback that'd be great.
Thanks - I can test elf on powerpc. Does anyone remember how to
create a.out executables?
Assuming this works, I'm not surew what to do with it. Jam it into
2.6.20, I guess. The lateness*largeness product is somewhat high though.
You appear to have generated this patch against an oldish kernel - there are
CONFIG_COMPAT_VDSO changes in there which might muck things up. I'll see...
On Sat, 27 Jan 2007 15:01:51 -0500 Parag Warudkar wrote:
> Here is a patch that does what Andrew Morton suggested (plus some more
> as explained below) .
> Patch inline below and also attached in case there is whitespace
> damage. Compile tested on i386 with make defconfig; make. If anyone
> can test on other arches and provide feedback that'd be great.
Please use tabs instead of spaces for indentation/alignment.
This applies to all of the Kconfig file changes and to
arch/x86_64/ia32/ia32_aout.c and fs/binfmt_aout.c.
The patch also contains (new) trailing whitespace.
---
~Randy
On Saturday 27 January 2007 23:02, Andrew Morton wrote:
> On Sat, 27 Jan 2007 15:01:51 -0500
>
> "Parag Warudkar" <[email protected]> wrote:
> > Here is a patch that does what Andrew Morton suggested (plus some more
> > as explained below) .
> > Patch inline below and also attached in case there is whitespace
> > damage. Compile tested on i386 with make defconfig; make. If anyone
> > can test on other arches and provide feedback that'd be great.
>
> Thanks - I can test elf on powerpc. Does anyone remember how to
> create a.out executables?
You need an old toolkit, but the historic section of ftp.funet.fi
has a few binaries. I also got a tarball of an old a.out SUSE
installation somewhere that I can dig out if there is interest.
> Assuming this works, I'm not surew what to do with it. Jam it into
> 2.6.20, I guess. The lateness*largeness product is somewhat high though.
I simpler fix might be to just not require the vDSO for signal handling
on a.out.
Here's a untested patch.
-Andi
Don't require the vDSO for handling a.out signals
and in other strange binfmts. vDSO is not necessarily mapped there.
Signed-off-by: Andi Kleen <[email protected]>
Index: linux/arch/i386/kernel/signal.c
===================================================================
--- linux.orig/arch/i386/kernel/signal.c
+++ linux/arch/i386/kernel/signal.c
@@ -21,6 +21,7 @@
#include <linux/suspend.h>
#include <linux/ptrace.h>
#include <linux/elf.h>
+#include <linux/binfmts.h>
#include <asm/processor.h>
#include <asm/ucontext.h>
#include <asm/uaccess.h>
@@ -349,7 +350,10 @@ static int setup_frame(int sig, struct k
goto give_sigsegv;
}
- restorer = (void *)VDSO_SYM(&__kernel_sigreturn);
+ if (current->binfmt->hasvdso)
+ restorer = (void *)VDSO_SYM(&__kernel_sigreturn);
+ else
+ restorer = (void *)&frame->retcode;
if (ka->sa.sa_flags & SA_RESTORER)
restorer = ka->sa.sa_restorer;
Index: linux/arch/x86_64/ia32/ia32_signal.c
===================================================================
--- linux.orig/arch/x86_64/ia32/ia32_signal.c
+++ linux/arch/x86_64/ia32/ia32_signal.c
@@ -21,6 +21,7 @@
#include <linux/stddef.h>
#include <linux/personality.h>
#include <linux/compat.h>
+#include <linux/binfmts.h>
#include <asm/ucontext.h>
#include <asm/uaccess.h>
#include <asm/i387.h>
@@ -449,7 +450,11 @@ int ia32_setup_frame(int sig, struct k_s
/* Return stub is in 32bit vsyscall page */
{
- void __user *restorer = VSYSCALL32_SIGRETURN;
+ void __user *restorer;
+ if (current->binfmt->hasvdso)
+ restorer = VSYSCALL32_SIGRETURN;
+ else
+ restorer = (void *)&frame->retcode;
if (ka->sa.sa_flags & SA_RESTORER)
restorer = ka->sa.sa_restorer;
err |= __put_user(ptr_to_compat(restorer), &frame->pretcode);
Index: linux/fs/binfmt_elf.c
===================================================================
--- linux.orig/fs/binfmt_elf.c
+++ linux/fs/binfmt_elf.c
@@ -76,7 +76,8 @@ static struct linux_binfmt elf_format =
.load_binary = load_elf_binary,
.load_shlib = load_elf_library,
.core_dump = elf_core_dump,
- .min_coredump = ELF_EXEC_PAGESIZE
+ .min_coredump = ELF_EXEC_PAGESIZE,
+ .hasvdso = 1
};
#define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE)
Index: linux/include/linux/binfmts.h
===================================================================
--- linux.orig/include/linux/binfmts.h
+++ linux/include/linux/binfmts.h
@@ -59,6 +59,7 @@ struct linux_binfmt {
int (*load_shlib)(struct file *);
int (*core_dump)(long signr, struct pt_regs * regs, struct file * file);
unsigned long min_coredump; /* minimal dump size */
+ int hasvdso;
};
extern int register_binfmt(struct linux_binfmt *);
On Mon, Jan 29, 2007 at 04:10:29AM +0100, Andi Kleen wrote:
> Don't require the vDSO for handling a.out signals
> --- linux.orig/include/linux/binfmts.h
> +++ linux/include/linux/binfmts.h
> @@ -59,6 +59,7 @@ struct linux_binfmt {
> int (*load_shlib)(struct file *);
> int (*core_dump)(long signr, struct pt_regs * regs, struct file * file);
> unsigned long min_coredump; /* minimal dump size */
> + int hasvdso;
nit: has_vdso, please.
On Mon, Jan 29, 2007 at 04:10:29AM +0100, Andi Kleen wrote:
> On Saturday 27 January 2007 23:02, Andrew Morton wrote:
> > On Sat, 27 Jan 2007 15:01:51 -0500
> >
> > "Parag Warudkar" <[email protected]> wrote:
> > > Here is a patch that does what Andrew Morton suggested (plus some more
> > > as explained below) .
> > > Patch inline below and also attached in case there is whitespace
> > > damage. Compile tested on i386 with make defconfig; make. If anyone
> > > can test on other arches and provide feedback that'd be great.
> >
> > Thanks - I can test elf on powerpc. Does anyone remember how to
> > create a.out executables?
>
> You need an old toolkit, but the historic section of ftp.funet.fi
> has a few binaries. I also got a tarball of an old a.out SUSE
> installation somewhere that I can dig out if there is interest.
>
On http://jpmarat.de/dl/sigtest.tar.bz2 you will find a small test prog
(source and a.out static).
On http://jpmarat.de/dl/gcc27jail.tar.bz2 you will find a gcc 2.7.2 jail
with toolchain extracted from an old SuSE installation (20M compressed
90M unpacked).