2.6.24-rc8

 fs

diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
index 813a887..7596e1e 100644
--- a/fs/binfmt_aout.c
+++ b/fs/binfmt_aout.c
@@ -31,7 +31,7 @@
 
 static int load_aout_binary(struct linux_binprm *, struct pt_regs * regs);
 static int load_aout_library(struct file*);
-static int aout_core_dump(long signr, struct pt_regs * regs, struct file *file);
+static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file, unsigned long limit);
 
 static struct linux_binfmt aout_format = {
    .module      = THIS_MODULE,
@@ -88,7 +88,7 @@ if (file->f_op->llseek) { \
  * dumping of the process results in another error..
  */
 
-static int aout_core_dump(long signr, struct pt_regs * regs, struct file *file)
+static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file, unsigned long limit)
 {
    mm_segment_t fs;
    int has_dumped = 0;
@@ -123,23 +123,19 @@ static int aout_core_dump(long signr, struct pt_regs * regs, struct file *file)
 /* If the size of the dump file exceeds the rlimit, then see what would happen
    if we wrote the stack, but not the data area.  */
 #ifdef __sparc__
-   if ((dump.u_dsize+dump.u_ssize) >
-       current->signal->rlim[RLIMIT_CORE].rlim_cur)
+   if ((dump.u_dsize + dump.u_ssize) > limit)
       dump.u_dsize = 0;
 #else
-   if ((dump.u_dsize+dump.u_ssize+1) * PAGE_SIZE >
-       current->signal->rlim[RLIMIT_CORE].rlim_cur)
+   if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > limit)
       dump.u_dsize = 0;
 #endif
 
 /* Make sure we have enough room to write the stack and data areas. */
 #ifdef __sparc__
-   if ((dump.u_ssize) >
-       current->signal->rlim[RLIMIT_CORE].rlim_cur)
+   if (dump.u_ssize > limit)
       dump.u_ssize = 0;
 #else
-   if ((dump.u_ssize+1) * PAGE_SIZE >
-       current->signal->rlim[RLIMIT_CORE].rlim_cur)
+   if ((dump.u_ssize + 1) * PAGE_SIZE > limit)
       dump.u_ssize = 0;
 #endif
 
@@ -323,7 +319,6 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
    current->mm->free_area_cache = current->mm->mmap_base;
    current->mm->cached_hole_size = 0;
 
-   current->mm->mmap = NULL;
    compute_creds(bprm);
     current->flags &= ~PF_FORKNOEXEC;
 #ifdef __sparc__