diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-06-12 16:42:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2004-06-12 16:42:15 -0700 |
| commit | 92b65511861887687acc9137cb7ebbdba4493175 (patch) | |
| tree | 18b8b0063ca3a139b70584160a9ccdf34158f592 /kernel | |
| parent | 0d39f73b023650abfbda99a5ff17e309c7d522e7 (diff) | |
[PATCH] dup_mmap() memory accounting fix
From: Hugh Dickins <hugh@veritas.com>
Oleg's patch was good in that exit_mmap usually does the un-accounting; but
dup_mmap still needs its own un-accounting for the case when it has charged
for a vma, but error before it's inserted into child mm's list.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/fork.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 2bd308efea50..0cbc27f48033 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -271,6 +271,7 @@ static inline int dup_mmap(struct mm_struct * mm, struct mm_struct * oldmm) struct vm_area_struct * mpnt, *tmp, **pprev; struct rb_node **rb_link, *rb_parent; int retval; + unsigned long charge; struct mempolicy *pol; down_write(&oldmm->mmap_sem); @@ -303,10 +304,12 @@ static inline int dup_mmap(struct mm_struct * mm, struct mm_struct * oldmm) if(mpnt->vm_flags & VM_DONTCOPY) continue; + charge = 0; if (mpnt->vm_flags & VM_ACCOUNT) { unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT; if (security_vm_enough_memory(len)) goto fail_nomem; + charge = len; } tmp = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); if (!tmp) @@ -370,8 +373,10 @@ fail_nomem_policy: kmem_cache_free(vm_area_cachep, tmp); fail_nomem: retval = -ENOMEM; + vm_unacct_memory(charge); goto out; } + static inline int mm_alloc_pgd(struct mm_struct * mm) { mm->pgd = pgd_alloc(mm); |