Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] x86: Don't require the vDSO for handling a.out signals

Browse source 
and in other strange binfmts. vDSO is not necessarily mapped there.

Signed-off-by: Andi Kleen <ak@suse.de>
This commit is contained in:
Andi Kleen 2007-02-13 13:26:26 +01:00 committed by Andi Kleen
parent 120fad7240
commit 9fbbd4dd17
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/i386/kernel/signal.c
View file

@ -21,6 +21,7 @@
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/elf.h> #include <linux/elf.h>
#include <linux/binfmts.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/ucontext.h> #include <asm/ucontext.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
@ -349,7 +350,10 @@ static int setup_frame(int sig, struct k_sigaction *ka,
goto give_sigsegv; 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) if (ka->sa.sa_flags & SA_RESTORER)
restorer = ka->sa.sa_restorer; restorer = ka->sa.sa_restorer;

7
arch/x86_64/ia32/ia32_signal.c
View file

@ -21,6 +21,7 @@
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/personality.h> #include <linux/personality.h>
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/binfmts.h>
#include <asm/ucontext.h> #include <asm/ucontext.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/i387.h> #include <asm/i387.h>
@ -449,7 +450,11 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
/* Return stub is in 32bit vsyscall page */ /* 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) if (ka->sa.sa_flags & SA_RESTORER)
restorer = ka->sa.sa_restorer; restorer = ka->sa.sa_restorer;
err |= __put_user(ptr_to_compat(restorer), &frame->pretcode); err |= __put_user(ptr_to_compat(restorer), &frame->pretcode);

3
fs/binfmt_elf.c
View file

@ -76,7 +76,8 @@ static struct linux_binfmt elf_format = {
.load_binary = load_elf_binary, .load_binary = load_elf_binary,
.load_shlib = load_elf_library, .load_shlib = load_elf_library,
.core_dump = elf_core_dump, .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) #define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE)

1
include/linux/binfmts.h
View file

@ -59,6 +59,7 @@ struct linux_binfmt {
int (*load_shlib)(struct file *); int (*load_shlib)(struct file *);
int (*core_dump)(long signr, struct pt_regs * regs, struct file * file); int (*core_dump)(long signr, struct pt_regs * regs, struct file * file);
unsigned long min_coredump; /* minimal dump size */ unsigned long min_coredump; /* minimal dump size */
int hasvdso;
}; };
extern int register_binfmt(struct linux_binfmt *); extern int register_binfmt(struct linux_binfmt *);