diff -urN 2.4.18pre7/mm/memory.c get_user_pages/mm/memory.c --- 2.4.18pre7/mm/memory.c Tue Jan 22 18:56:30 2002 +++ get_user_pages/mm/memory.c Thu Jan 31 04:14:33 2002 @@ -442,6 +442,7 @@ return page; } +/* If 'pages' is not NULL we'll fail on I/O mappings (VM_IO) */ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, unsigned long start, int len, int write, int force, struct page **pages, struct vm_area_struct **vmas) { @@ -453,6 +454,7 @@ vma = find_extend_vma(mm, start); if ( !vma || + (pages && vma->vm_flags & VM_IO) || (!force && ((write && (!(vma->vm_flags & VM_WRITE))) || (!write && (!(vma->vm_flags & VM_READ))) ) )) { @@ -486,8 +488,9 @@ /* FIXME: call the correct function, * depending on the type of the found page */ - if (pages[i]) - page_cache_get(pages[i]); + if (!pages[i]) + goto bad_page; + page_cache_get(pages[i]); } if (vmas) vmas[i] = vma; @@ -497,7 +500,19 @@ } while(len && start < vma->vm_end); spin_unlock(&mm->page_table_lock); } while(len); +out: return i; + + /* + * We found an invalid page in the VMA. Release all we have + * so far and fail. + */ +bad_page: + spin_unlock(&mm->page_table_lock); + while (i--) + page_cache_release(pages[i]); + i = -EFAULT; + goto out; } /*