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
patch-2.6.6-vs1.9.0
[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
679e68a
..
ad67b04
100644
(file)
--- a/
arch/ia64/ia32/binfmt_elf32.c
+++ b/
arch/ia64/ia32/binfmt_elf32.c
@@
-151,7
+151,7
@@
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;
+ unsigned long stack_base
, grow
;
struct vm_area_struct *mpnt;
struct mm_struct *mm = current->mm;
int i;
struct vm_area_struct *mpnt;
struct mm_struct *mm = current->mm;
int i;
@@
-168,7
+168,10
@@
ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
if (!mpnt)
return -ENOMEM;
if (!mpnt)
return -ENOMEM;
- if (security_vm_enough_memory((IA32_STACK_TOP - (PAGE_MASK & (unsigned long) bprm->p))>>PAGE_SHIFT)) {
+ 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;
}
kmem_cache_free(vm_area_cachep, mpnt);
return -ENOMEM;
}
@@
-191,7
+194,9
@@
ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack)
mpnt->vm_file = NULL;
mpnt->vm_private_data = 0;
insert_vm_struct(current->mm, mpnt);
mpnt->vm_file = NULL;
mpnt->vm_private_data = 0;
insert_vm_struct(current->mm, mpnt);
- current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
+ // current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
+ vx_vmpages_sub(current->mm, current->mm->total_vm -
+ ((mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT));
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
}
for (i = 0 ; i < MAX_ARG_PAGES ; i++) {