git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
ia64
/
ia32
/
binfmt_elf32.c
diff --git
a/arch/ia64/ia32/binfmt_elf32.c
b/arch/ia64/ia32/binfmt_elf32.c
index
093129c
..
a3e5d02
100644
(file)
--- a/
arch/ia64/ia32/binfmt_elf32.c
+++ b/
arch/ia64/ia32/binfmt_elf32.c
@@
-35,7
+35,10
@@
extern void ia64_elf32_init (struct pt_regs *regs);
static void elf32_set_personality (void);
static void elf32_set_personality (void);
-#define setup_arg_pages(bprm,exec) ia32_setup_arg_pages(bprm,exec)
+static unsigned long __attribute ((unused))
+randomize_stack_top(unsigned long stack_top);
+
+#define setup_arg_pages(bprm,tos,exec) ia32_setup_arg_pages(bprm,exec)
#define elf_map elf32_map
#undef SET_PERSONALITY
#define elf_map elf32_map
#undef SET_PERSONALITY
@@
-100,7
+103,11
@@
ia64_elf32_init (struct pt_regs *regs)
vma->vm_ops = &ia32_shared_page_vm_ops;
down_write(¤t->mm->mmap_sem);
{
vma->vm_ops = &ia32_shared_page_vm_ops;
down_write(¤t->mm->mmap_sem);
{
- insert_vm_struct(current->mm, vma);
+ if (insert_vm_struct(current->mm, vma)) {
+ kmem_cache_free(vm_area_cachep, vma);
+ up_write(¤t->mm->mmap_sem);
+ BUG();
+ }
}
up_write(¤t->mm->mmap_sem);
}
}
up_write(¤t->mm->mmap_sem);
}
@@
-123,7
+130,11
@@
ia64_elf32_init (struct pt_regs *regs)
vma->vm_ops = &ia32_gate_page_vm_ops;
down_write(¤t->mm->mmap_sem);
{
vma->vm_ops = &ia32_gate_page_vm_ops;
down_write(¤t->mm->mmap_sem);
{
- insert_vm_struct(current->mm, vma);
+ if (insert_vm_struct(current->mm, vma)) {
+ kmem_cache_free(vm_area_cachep, vma);
+ up_write(¤t->mm->mmap_sem);
+ BUG();
+ }
}
up_write(¤t->mm->mmap_sem);
}
}
up_write(¤t->mm->mmap_sem);
}
@@
-142,7
+153,11
@@
ia64_elf32_init (struct pt_regs *regs)
vma->vm_flags = VM_READ|VM_WRITE|VM_MAYREAD|VM_MAYWRITE;
down_write(¤t->mm->mmap_sem);
{
vma->vm_flags = VM_READ|VM_WRITE|VM_MAYREAD|VM_MAYWRITE;
down_write(¤t->mm->mmap_sem);
{
- insert_vm_struct(current->mm, vma);
+ if (insert_vm_struct(current->mm, vma)) {
+ kmem_cache_free(vm_area_cachep, vma);
+ up_write(¤t->mm->mmap_sem);
+ BUG();
+ }
}
up_write(¤t->mm->mmap_sem);
}
}
up_write(¤t->mm->mmap_sem);
}
@@
-187,10
+202,10
@@
ia64_elf32_init (struct pt_regs *regs)
int
ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
{
int
ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
{
- unsigned long stack_base
, grow
;
+ unsigned long stack_base;
struct vm_area_struct *mpnt;
struct mm_struct *mm = current->mm;
struct vm_area_struct *mpnt;
struct mm_struct *mm = current->mm;
- int i;
+ int i
, ret
;
stack_base = IA32_STACK_TOP - MAX_ARG_PAGES*PAGE_SIZE;
mm->arg_start = bprm->p + stack_base;
stack_base = IA32_STACK_TOP - MAX_ARG_PAGES*PAGE_SIZE;
mm->arg_start = bprm->p + stack_base;
@@
-204,14
+219,6
@@
ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
if (!mpnt)
return -ENOMEM;
if (!mpnt)
return -ENOMEM;
- grow = (IA32_STACK_TOP - (PAGE_MASK & (unsigned long) bprm->p))
- >> PAGE_SHIFT;
- if (security_vm_enough_memory(grow) ||
- !vx_vmpages_avail(mm, grow)) {
- kmem_cache_free(vm_area_cachep, mpnt);
- return -ENOMEM;
- }
-
memset(mpnt, 0, sizeof(*mpnt));
down_write(¤t->mm->mmap_sem);
memset(mpnt, 0, sizeof(*mpnt));
down_write(¤t->mm->mmap_sem);
@@
-227,8
+234,11
@@
ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
mpnt->vm_flags = VM_STACK_FLAGS;
mpnt->vm_page_prot = (mpnt->vm_flags & VM_EXEC)?
PAGE_COPY_EXEC: PAGE_COPY;
mpnt->vm_flags = VM_STACK_FLAGS;
mpnt->vm_page_prot = (mpnt->vm_flags & VM_EXEC)?
PAGE_COPY_EXEC: PAGE_COPY;
- insert_vm_struct(current->mm, mpnt);
- // current->mm->stack_vm = current->mm->total_vm = vma_pages(mpnt);
+ if ((ret = insert_vm_struct(current->mm, mpnt))) {
+ up_write(¤t->mm->mmap_sem);
+ kmem_cache_free(vm_area_cachep, mpnt);
+ return ret;
+ }
vx_vmpages_sub(current->mm, current->mm->total_vm - vma_pages(mpnt));
current->mm->stack_vm = current->mm->total_vm;
}
vx_vmpages_sub(current->mm, current->mm->total_vm - vma_pages(mpnt));
current->mm->stack_vm = current->mm->total_vm;
}
@@
-255,12
+265,10
@@
elf32_set_personality (void)
{
set_personality(PER_LINUX32);
current->thread.map_base = IA32_PAGE_OFFSET/3;
{
set_personality(PER_LINUX32);
current->thread.map_base = IA32_PAGE_OFFSET/3;
- current->thread.task_size = IA32_PAGE_OFFSET; /* use what Linux/x86 uses... */
- set_fs(USER_DS); /* set addr limit for new TASK_SIZE */
}
static unsigned long
}
static unsigned long
-elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type)
+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type
, unsigned long unused
)
{
unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK;
{
unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK;