On Thu, Aug 04, 2005 at 07:05:30PM +0100, Hugh Dickins wrote:
> mremap's move_vma is applying __vm_stat_account to the old vma which may
> have already been freed: move it to just before the do_munmap.
>
> mremapping to and fro with CONFIG_DEBUG_SLAB=y showed /proc/<pid>/status
> VmSize and VmData wrapping just like in kernel bugzilla #4842, and fixed
> by this patch - worth including in 2.6.13, though not yet confirmed that
> it fixes that specific report from Frank van Maarseveen.
The patch works, thanks.
>
> Signed-off-by: Hugh Dickins <[email protected]>
>
> --- 2.6.13-rc5-git2/mm/mremap.c 2005-06-17 20:48:29.000000000 +0100
> +++ linux/mm/mremap.c 2005-08-03 16:22:33.000000000 +0100
> @@ -229,6 +229,7 @@ static unsigned long move_vma(struct vm_
> * since do_munmap() will decrement it by old_len == new_len
> */
> mm->total_vm += new_len >> PAGE_SHIFT;
> + __vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT);
>
> if (do_munmap(mm, old_addr, old_len) < 0) {
> /* OOM: unable to split vma, just get accounts right */
> @@ -243,7 +244,6 @@ static unsigned long move_vma(struct vm_
> vma->vm_next->vm_flags |= VM_ACCOUNT;
> }
>
> - __vm_stat_account(mm, vma->vm_flags, vma->vm_file, new_len>>PAGE_SHIFT);
> if (vm_flags & VM_LOCKED) {
> mm->locked_vm += new_len >> PAGE_SHIFT;
> if (new_len > old_len)
--
Frank
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
| |
 |