]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
get_user_pages: don't try to follow PFNMAP pages
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Dec 2005 00:24:33 +0000 (16:24 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 13 Dec 2005 00:24:33 +0000 (16:24 -0800)
Nick Piggin points out that a few drivers play games with VM_IO (why?
who knows..) and thus a pfn-remapped area may not have that bit set even
if remap_pfn_range() set it originally.

So make it explicit in get_user_pages() that we don't follow VM_PFNMAP
pages, since pretty much by definition they do not have a "struct page"
associated with them.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
mm/memory.c

index 47c533eaa0721c558eddcc68dfa6c8de1f2844ef..d22f78c8a381a2dbcc78fbb4f15c7e4ef8f9125f 100644 (file)
@@ -1009,7 +1009,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
                        continue;
                }
 
-               if (!vma || (vma->vm_flags & VM_IO)
+               if (!vma || (vma->vm_flags & (VM_IO | VM_PFNMAP))
                                || !(vm_flags & vma->vm_flags))
                        return i ? : -EFAULT;