mm: make get_user_pages() more robust in handling arguments
Subsystems (3)
PATCH 1/2 mm: make get_user_pages() more robust in handling arguments
Ensure that get_user_pages() evaluates len upon entry into the while loops. A BUG_ON check is added so that it will catch potential bugs when it is asked to grab zero pages. follow_hugetlb_page() is modified to adapt the changes made in get_user_pages().
Signed-off-by Eugene Teo <[email protected]>
--- include/linux/hugetlb.h | 2 +- mm/hugetlb.c | 10 +++------- mm/memory.c | 15 ++++++--------- 3 files changed, 10 insertions(+), 17 deletions(-)
include/linux/hugetlb.h +1 -1
@@ -20,7 +20,7 @@ int hugetlb_sysctl_handler(struct ctl_table *, int, struct file *, void __user *int hugetlb_overcommit_handler (struct ctl_table *,int ,struct file *,void __user *,size_t *,loff_t *);int hugetlb_treat_movable_handler (struct ctl_table *,int ,struct file *,void __user *,size_t *,loff_t *);int copy_hugetlb_page_range (struct mm_struct *,struct mm_struct *,struct vm_area_struct *); -int follow_hugetlb_page (struct mm_struct *,struct vm_area_struct *,struct page **,struct vm_area_struct **,unsigned long *,int *,int ,int ); +int follow_hugetlb_page (struct mm_struct *,struct vm_area_struct *,struct page **,struct vm_area_struct **,unsigned long *,int ,int ,int );void unmap_hugepage_range (struct vm_area_struct *,unsigned long ,unsigned long );void __unmap_hugepage_range (struct vm_area_struct *,unsigned long ,unsigned long );int hugetlb_prefault (struct address_space *,struct vm_area_struct *);
mm/hugetlb.c +3 -7
@@ -960,15 +960,14 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,int follow_hugetlb_page (struct mm_struct *mm,struct vm_area_struct *vma,struct page **pages,struct vm_area_struct **vmas, -unsigned long *position,int *length,int i, +unsigned long *position,int length,int i,int write) {unsigned long pfn_offset;unsigned long vaddr = *position; -int remainder = *length;spin_lock (&mm->page_table_lock); -while (vaddr < vma->vm_end && remainder) { +while (i < length && vaddr < vma->vm_end) {pte_t *pte;struct page *page;
@@ -988,7 +987,6 @@ int follow_hugetlb_page(struct mm_struct *mm, struct vm_area_struct *vma,if (!(ret &VM_FAULT_ERROR ))continue ; - remainder =0 ;if (!i) i = -EFAULT ;break ;
@@ -1007,9 +1005,8 @@ same_page: vaddr +=PAGE_SIZE ; ++pfn_offset; - --remainder; ++i; -if (vaddr < vma->vm_end && remainder && +if (i < length && vaddr < vma->vm_end && pfn_offset <HPAGE_SIZE /PAGE_SIZE ) {/* * We use pfn_offset to avoid touching the pageframes
@@ -1019,7 +1016,6 @@ same_page: } }spin_unlock (&mm->page_table_lock); - *length = remainder; *position = vaddr;return i;
mm/memory.c +6 -9
@@ -989,8 +989,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,int i;unsigned int vm_flags; -if (len <=0 ) -return 0 ; +BUG_ON (len <=0 );/* * Require read or write permissions. * If 'force' is set, we only require the "MAY" flags.
@@ -999,7 +998,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, vm_flags &= force ? (VM_MAYREAD |VM_MAYWRITE ) : (VM_READ |VM_WRITE ); i =0 ; - do { +while (i < len) {struct vm_area_struct *vma;unsigned int foll_flags;
@@ -1039,7 +1038,6 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, vmas[i] = gate_vma; i++; start +=PAGE_SIZE ; - len--;continue ; }
@@ -1049,7 +1047,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,if (is_vm_hugetlb_page (vma)) { i =follow_hugetlb_page (mm, vma, pages, vmas, - &start, &len, i, write); + &start, len, i, write);continue ; }
@@ -1061,7 +1059,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, !vma->vm_ops->fault))) foll_flags |=FOLL_ANON ; - do { +while (i < len && start < vma->vm_end) {struct page *page;/*
@@ -1114,9 +1112,8 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, vmas[i] = vma; i++; start +=PAGE_SIZE ; - len--; - }while (len && start < vma->vm_end); - }while (len); + } + }return i; }EXPORT_SYMBOL (get_user_pages);