aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorvenkatesh.pallipadi@intel.com <venkatesh.pallipadi@intel.com>2009-01-09 19:13:09 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-13 13:12:59 -0500
commita36706131182f5507d1e2cfbf391b0fa8d72203c (patch)
tree46aede534e494045b7cbe4df42b780ca138e6d3e /mm
parente0b325d310a6b11f1538413fd557d2eb98f2fae5 (diff)
x86 PAT: remove PFNMAP type on track_pfn_vma_new() error
Impact: fix (harmless) double-free of memtype entries and avoid warning On track_pfn_vma_new() failure, reset the vm_flags so that there will be no second cleanup happening when upper level routines call unmap_vmas(). This patch fixes part of the bug reported here: http://marc.info/?l=linux-kernel&m=123108883716357&w=2 Specifically the error message: X:5010 freeing invalid memtype d0000000-d0101000 Is due to multiple frees on error path, will not happen with the patch below. Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm')
-rw-r--r--mm/memory.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c
index c2d4c477e5bb..d3ee2ea5615c 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1672,8 +1672,14 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
1672 vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP; 1672 vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
1673 1673
1674 err = track_pfn_vma_new(vma, prot, pfn, PAGE_ALIGN(size)); 1674 err = track_pfn_vma_new(vma, prot, pfn, PAGE_ALIGN(size));
1675 if (err) 1675 if (err) {
1676 /*
1677 * To indicate that track_pfn related cleanup is not
1678 * needed from higher level routine calling unmap_vmas
1679 */
1680 vma->vm_flags &= ~(VM_IO | VM_RESERVED | VM_PFNMAP);
1676 return -EINVAL; 1681 return -EINVAL;
1682 }
1677 1683
1678 BUG_ON(addr >= end); 1684 BUG_ON(addr >= end);
1679 pfn -= addr >> PAGE_SHIFT; 1685 pfn -= addr >> PAGE_SHIFT;