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
vserver 2.0 rc7
[linux-2.6.git]
/
arch
/
x86_64
/
ia32
/
ia32_aout.c
diff --git
a/arch/x86_64/ia32/ia32_aout.c
b/arch/x86_64/ia32/ia32_aout.c
index
4fecd67
..
ba4b1d7
100644
(file)
--- a/
arch/x86_64/ia32/ia32_aout.c
+++ b/
arch/x86_64/ia32/ia32_aout.c
@@
-183,9
+183,9
@@
static int aout_core_dump(long signr, struct pt_regs * regs, struct file *file)
/* make sure we actually have a data and stack area to dump */
set_fs(USER_DS);
/* make sure we actually have a data and stack area to dump */
set_fs(USER_DS);
- if (
verify_area
(VERIFY_READ, (void *) (unsigned long)START_DATA(dump), dump.u_dsize << PAGE_SHIFT))
+ if (
!access_ok
(VERIFY_READ, (void *) (unsigned long)START_DATA(dump), dump.u_dsize << PAGE_SHIFT))
dump.u_dsize = 0;
dump.u_dsize = 0;
- if (
verify_area
(VERIFY_READ, (void *) (unsigned long)START_STACK(dump), dump.u_ssize << PAGE_SHIFT))
+ if (
!access_ok
(VERIFY_READ, (void *) (unsigned long)START_STACK(dump), dump.u_ssize << PAGE_SHIFT))
dump.u_ssize = 0;
set_fs(KERNEL_DS);
dump.u_ssize = 0;
set_fs(KERNEL_DS);
@@
-314,7
+314,7
@@
static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
(current->mm->start_brk = N_BSSADDR(ex));
current->mm->free_area_cache = TASK_UNMAPPED_BASE;
(current->mm->start_brk = N_BSSADDR(ex));
current->mm->free_area_cache = TASK_UNMAPPED_BASE;
-
vx_rsspages_sub(current->mm, current->mm->rss
);
+
set_mm_counter(current->mm, rss, 0
);
current->mm->mmap = NULL;
compute_creds(bprm);
current->flags &= ~PF_FORKNOEXEC;
current->mm->mmap = NULL;
compute_creds(bprm);
current->flags &= ~PF_FORKNOEXEC;