--- ./arch/alpha/mm/fault.c.~1~ Sun Apr 1 01:17:07 2001
+++ ./arch/alpha/mm/fault.c Tue Jun 5 02:18:03 2001
@@ -121,7 +121,7 @@
goto good_area;
if (!(vma->vm_flags & VM_GROWSDOWN))
goto bad_area;
- if (expand_stack(vma, address))
+ if (expand_stack(vma, address, NULL))
goto bad_area;
/*
* Ok, we have a good vm_area for this memory access, so
--- ./arch/arm/mm/fault-common.c.~1~ Tue May 1 19:35:17 2001
+++ ./arch/arm/mm/fault-common.c Tue Jun 5 02:50:29 2001
@@ -229,7 +229,7 @@
goto survive;
check_stack:
- if (vma->vm_flags & VM_GROWSDOWN && !expand_stack(vma, addr))
+ if (vma->vm_flags & VM_GROWSDOWN && !expand_stack(vma, addr, NULL))
goto good_area;
out:
return fault;
--- ./arch/cris/mm/fault.c.~1~ Sat May 26 04:03:35 2001
+++ ./arch/cris/mm/fault.c Tue Jun 5 02:50:35 2001
@@ -242,7 +242,7 @@
if (address + PAGE_SIZE < rdusp())
goto bad_area;
}
- if (expand_stack(vma, address))
+ if (expand_stack(vma, address, NULL))
goto bad_area;
/*
--- ./arch/i386/mm/fault.c.~1~ Sat May 26 04:03:35 2001
+++ ./arch/i386/mm/fault.c Tue Jun 5 02:19:01 2001
@@ -30,13 +30,13 @@
*/
int __verify_write(const void * addr, unsigned long size)
{
- struct vm_area_struct * vma;
+ struct vm_area_struct * vma, * prev_vma;
unsigned long start = (unsigned long) addr;
if (!size)
return 1;
- vma = find_vma(current->mm, start);
+ vma = find_vma_prev(current->mm, start, &prev_vma);
if (!vma)
goto bad_area;
if (vma->vm_start > start)
@@ -70,7 +70,7 @@
check_stack:
if (!(vma->vm_flags & VM_GROWSDOWN))
goto bad_area;
- if (expand_stack(vma, start) == 0)
+ if (expand_stack(vma, start, prev_vma) == 0)
goto good_area;
bad_area:
@@ -107,7 +107,7 @@
{
struct task_struct *tsk;
struct mm_struct *mm;
- struct vm_area_struct * vma;
+ struct vm_area_struct * vma, * prev_vma;
unsigned long address;
unsigned long page;
unsigned long fixup;
@@ -151,7 +151,7 @@
down_read(&mm->mmap_sem);
- vma = find_vma(mm, address);
+ vma = find_vma_prev(mm, address, &prev_vma);
if (!vma)
goto bad_area;
if (vma->vm_start <= address)
@@ -168,7 +168,7 @@
if (address + 32 < regs->esp)
goto bad_area;
}
- if (expand_stack(vma, address))
+ if (expand_stack(vma, address, prev_vma))
goto bad_area;
/*
* Ok, we have a good vm_area for this memory access, so
--- ./arch/ia64/mm/fault.c.~1~ Tue May 1 19:35:18 2001
+++ ./arch/ia64/mm/fault.c Tue Jun 5 02:50:43 2001
@@ -122,7 +122,7 @@
if (rgn_index(address) != rgn_index(vma->vm_start)
|| rgn_offset(address) >= RGN_MAP_LIMIT)
goto bad_area;
- if (expand_stack(vma, address))
+ if (expand_stack(vma, address, NULL))
goto bad_area;
} else {
vma = prev_vma;
--- ./arch/m68k/mm/fault.c.~1~ Sun Apr 1 01:17:08 2001
+++ ./arch/m68k/mm/fault.c Tue Jun 5 02:50:52 2001
@@ -120,7 +120,7 @@
if (address + 256 < rdusp())
goto map_err;
}
- if (expand_stack(vma, address))
+ if (expand_stack(vma, address, NULL))
goto map_err;
/*
--- ./arch/mips/mm/fault.c.~1~ Sun Apr 1 01:17:08 2001
+++ ./arch/mips/mm/fault.c Tue Jun 5 02:50:57 2001
@@ -68,7 +68,7 @@
goto good_area;
if (!(vma->vm_flags & VM_GROWSDOWN))
goto bad_area;
- if (expand_stack(vma, address))
+ if (expand_stack(vma, address, NULL))
goto bad_area;
/*
* Ok, we have a good vm_area for this memory access, so
--- ./arch/mips64/mm/fault.c.~1~ Sun Apr 1 01:17:08 2001
+++ ./arch/mips64/mm/fault.c Tue Jun 5 02:51:02 2001
@@ -103,7 +103,7 @@
goto good_area;
if (!(vma->vm_flags & VM_GROWSDOWN))
goto bad_area;
- if (expand_stack(vma, address))
+ if (expand_stack(vma, address, NULL))
goto bad_area;
/*
* Ok, we have a good vm_area for this memory access, so
--- ./arch/ppc/mm/fault.c.~1~ Sat May 26 04:03:38 2001
+++ ./arch/ppc/mm/fault.c Tue Jun 5 02:19:30 2001
@@ -63,7 +63,7 @@
void do_page_fault(struct pt_regs *regs, unsigned long address,
unsigned long error_code)
{
- struct vm_area_struct * vma;
+ struct vm_area_struct * vma, * prev_vma;
struct mm_struct *mm = current->mm;
siginfo_t info;
int code = SEGV_MAPERR;
@@ -103,14 +103,14 @@
return;
}
down_read(&mm->mmap_sem);
- vma = find_vma(mm, address);
+ vma = find_vma_prev(mm, address, &prev_vma);
if (!vma)
goto bad_area;
if (vma->vm_start <= address)
goto good_area;
if (!(vma->vm_flags & VM_GROWSDOWN))
goto bad_area;
- if (expand_stack(vma, address))
+ if (expand_stack(vma, address, prev_vma))
goto bad_area;
good_area:
--- ./arch/s390/mm/fault.c.~1~ Tue May 1 19:35:20 2001
+++ ./arch/s390/mm/fault.c Tue Jun 5 02:19:50 2001
@@ -132,7 +132,7 @@
goto good_area;
if (!(vma->vm_flags & VM_GROWSDOWN))
goto bad_area;
- if (expand_stack(vma, address))
+ if (expand_stack(vma, address, NULL))
goto bad_area;
/*
* Ok, we have a good vm_area for this memory access, so
--- ./arch/s390x/mm/fault.c.~1~ Sun Apr 1 01:17:11 2001
+++ ./arch/s390x/mm/fault.c Tue Jun 5 02:51:11 2001
@@ -133,7 +133,7 @@
goto good_area;
if (!(vma->vm_flags & VM_GROWSDOWN))
goto bad_area;
- if (expand_stack(vma, address))
+ if (expand_stack(vma, address, NULL))
goto bad_area;
/*
* Ok, we have a good vm_area for this memory access, so
--- ./arch/sh/mm/fault.c.~1~ Sun Apr 1 01:17:11 2001
+++ ./arch/sh/mm/fault.c Tue Jun 5 02:51:22 2001
@@ -78,7 +78,7 @@
check_stack:
if (!(vma->vm_flags & VM_GROWSDOWN))
goto bad_area;
- if (expand_stack(vma, start) == 0)
+ if (expand_stack(vma, start, NULL) == 0)
goto good_area;
bad_area:
@@ -118,7 +118,7 @@
goto good_area;
if (!(vma->vm_flags & VM_GROWSDOWN))
goto bad_area;
- if (expand_stack(vma, address))
+ if (expand_stack(vma, address, NULL))
goto bad_area;
/*
* Ok, we have a good vm_area for this memory access, so
--- ./arch/sparc/mm/fault.c.~1~ Sun Apr 1 01:17:11 2001
+++ ./arch/sparc/mm/fault.c Tue Jun 5 02:20:22 2001
@@ -240,7 +240,7 @@
goto good_area;
if(!(vma->vm_flags & VM_GROWSDOWN))
goto bad_area;
- if(expand_stack(vma, address))
+ if(expand_stack(vma, address, NULL))
goto bad_area;
/*
* Ok, we have a good vm_area for this memory access, so
@@ -487,7 +487,7 @@
goto good_area;
if(!(vma->vm_flags & VM_GROWSDOWN))
goto bad_area;
- if(expand_stack(vma, address))
+ if(expand_stack(vma, address, NULL))
goto bad_area;
good_area:
info.si_code = SEGV_ACCERR;
--- ./arch/sparc64/mm/fault.c.~1~ Sun Apr 1 01:17:12 2001
+++ ./arch/sparc64/mm/fault.c Tue Jun 5 02:20:35 2001
@@ -280,7 +280,7 @@
goto good_area;
if (!(vma->vm_flags & VM_GROWSDOWN))
goto bad_area;
- if (expand_stack(vma, address))
+ if (expand_stack(vma, address, NULL))
goto bad_area;
/*
* Ok, we have a good vm_area for this memory access, so
--- ./include/linux/mm.h.~1~ Tue Jun 5 02:16:12 2001
+++ ./include/linux/mm.h Tue Jun 5 02:21:21 2001
@@ -497,13 +497,18 @@
#define GFP_DMA __GFP_DMA
+extern int heap_stack_gap;
+
/* vma is the first one with address < vma->vm_end,
* and even address < vma->vm_start. Have to extend vma. */
-static inline int expand_stack(struct vm_area_struct * vma, unsigned long address)
+static inline int expand_stack(struct vm_area_struct * vma, unsigned long address,
+ struct vm_area_struct * prev_vma)
{
unsigned long grow;
address &= PAGE_MASK;
+ if (prev_vma && prev_vma->vm_end + (heap_stack_gap << PAGE_SHIFT) > address)
+ return -ENOMEM;
grow = (vma->vm_start - address) >> PAGE_SHIFT;
if (vma->vm_end - address > current->rlim[RLIMIT_STACK].rlim_cur ||
((vma->vm_mm->total_vm + grow) << PAGE_SHIFT) > current->rlim[RLIMIT_AS].rlim_cur)
--- ./include/linux/sysctl.h.~1~ Tue Jun 5 02:16:15 2001
+++ ./include/linux/sysctl.h Tue Jun 5 02:28:57 2001
@@ -134,7 +134,8 @@
VM_PAGECACHE=7, /* struct: Set cache memory thresholds */
VM_PAGERDAEMON=8, /* struct: Control kswapd behaviour */
VM_PGT_CACHE=9, /* struct: Set page table cache parameters */
- VM_PAGE_CLUSTER=10 /* int: set number of pages to swap together */
+ VM_PAGE_CLUSTER=10, /* int: set number of pages to swap together */
+ VM_HEAP_STACK_GAP=11, /* int: page gap between heap and stack */
};
--- ./kernel/sysctl.c.~1~ Tue May 1 19:35:33 2001
+++ ./kernel/sysctl.c Tue Jun 5 02:29:12 2001
@@ -270,6 +270,8 @@
&pgt_cache_water, 2*sizeof(int), 0644, NULL, &proc_dointvec},
{VM_PAGE_CLUSTER, "page-cluster",
&page_cluster, sizeof(int), 0644, NULL, &proc_dointvec},
+ {VM_HEAP_STACK_GAP, "heap-stack-gap",
+ &heap_stack_gap, sizeof(int), 0644, NULL, &proc_dointvec},
{0}
};
--- ./mm/mmap.c.~1~ Tue Jun 5 02:16:11 2001
+++ ./mm/mmap.c Tue Jun 5 02:50:12 2001
@@ -38,6 +38,7 @@
};
int sysctl_overcommit_memory;
+int heap_stack_gap = 1;
/* Check that a process has enough memory to allocate a
* new virtual mapping.
@@ -417,9 +418,15 @@
for (vma = find_vma(current->mm, addr); ; vma = vma->vm_next) {
/* At this point: (!vma || addr < vma->vm_end). */
+ unsigned long __heap_stack_gap;
if (TASK_SIZE - len < addr)
return -ENOMEM;
- if (!vma || addr + len <= vma->vm_start)
+ if (!vma)
+ return addr;
+ __heap_stack_gap = 0;
+ if (vma->vm_flags & VM_GROWSDOWN)
+ __heap_stack_gap = heap_stack_gap << PAGE_SHIFT;
+ if (addr + len + __heap_stack_gap <= vma->vm_start)
return addr;
addr = vma->vm_end;
}
@@ -540,11 +547,11 @@
struct vm_area_struct * find_extend_vma(struct mm_struct * mm, unsigned long addr)
{
- struct vm_area_struct * vma;
+ struct vm_area_struct * vma, * prev_vma;
unsigned long start;
addr &= PAGE_MASK;
- vma = find_vma(mm,addr);
+ vma = find_vma_prev(mm,addr, &prev_vma);
if (!vma)
return NULL;
if (vma->vm_start <= addr)
@@ -552,7 +559,7 @@
if (!(vma->vm_flags & VM_GROWSDOWN))
return NULL;
start = vma->vm_start;
- if (expand_stack(vma, addr))
+ if (expand_stack(vma, addr, prev_vma))
return NULL;
if (vma->vm_flags & VM_LOCKED) {
make_pages_present(addr, start);
--- ./mm/memory.c.~1~ Tue May 1 19:35:33 2001
+++ ./mm/memory.c Tue Jun 5 02:44:24 2001
@@ -442,7 +442,7 @@
unsigned long ptr, end;
int err;
struct mm_struct * mm;
- struct vm_area_struct * vma = 0;
+ struct vm_area_struct * vma, * prev_vma;
struct page * map;
int i;
int datain = (rw == READ);
@@ -468,19 +468,20 @@
iobuf->length = len;
i = 0;
+ vma = NULL;
/*
* First of all, try to fault in all of the necessary pages
*/
while (ptr < end) {
if (!vma || ptr >= vma->vm_end) {
- vma = find_vma(current->mm, ptr);
+ vma = find_vma_prev(mm, ptr, &prev_vma);
if (!vma)
goto out_unlock;
if (vma->vm_start > ptr) {
if (!(vma->vm_flags & VM_GROWSDOWN))
goto out_unlock;
- if (expand_stack(vma, ptr))
+ if (expand_stack(vma, ptr, prev_vma))
goto out_unlock;
}
if (((datain) && (!(vma->vm_flags & VM_WRITE))) ||