[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110801232051.189269480@clark.kroah.org>
Date: Mon, 01 Aug 2011 16:18:21 -0700
From: Greg KH <gregkh@...e.de>
To: linux-kernel@...r.kernel.org, stable@...nel.org
Cc: stable-review@...nel.org, torvalds@...ux-foundation.org,
akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
Bob Liu <lliubbo@...il.com>,
Geert Uytterhoeven <geert@...ux-m68k.org>,
David Howells <dhowells@...hat.com>,
Greg Ungerer <gerg@...inux.org>,
Mike Frysinger <vapier@...too.org>
Subject: [06/70] mm/nommu.c: fix remap_pfn_range()
2.6.39-stable review patch. If anyone has any objections, please let us know.
------------------
From: Bob Liu <lliubbo@...il.com>
commit 8f3b1327aa454bc8283e96bca7669c3c88b83f79 upstream.
remap_pfn_range() means map physical address pfn<<PAGE_SHIFT to user addr.
For nommu arch it's implemented by vma->vm_start = pfn << PAGE_SHIFT which
is wrong acroding the original meaning of this function. And some driver
developer using remap_pfn_range() with correct parameter will get
unexpected result because vm_start is changed. It should be implementd
like addr = pfn << PAGE_SHIFT but which is meanless on nommu arch, this
patch just make it simply return.
Parameter name and setting of vma->vm_flags also be fixed.
Signed-off-by: Bob Liu <lliubbo@...il.com>
Cc: Geert Uytterhoeven <geert@...ux-m68k.org>
Cc: David Howells <dhowells@...hat.com>
Acked-by: Greg Ungerer <gerg@...inux.org>
Cc: Mike Frysinger <vapier@...too.org>
Cc: Bob Liu <lliubbo@...il.com>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
mm/nommu.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1819,10 +1819,13 @@ struct page *follow_page(struct vm_area_
return NULL;
}
-int remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
- unsigned long to, unsigned long size, pgprot_t prot)
+int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
+ unsigned long pfn, unsigned long size, pgprot_t prot)
{
- vma->vm_start = vma->vm_pgoff << PAGE_SHIFT;
+ if (addr != (pfn << PAGE_SHIFT))
+ return -EINVAL;
+
+ vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
return 0;
}
EXPORT_SYMBOL(remap_pfn_range);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists