Commit 96e1fac1 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Linus Torvalds

mm/gup: use unpin_user_pages() in __gup_longterm_locked()

When FOLL_PIN is passed to __get_user_pages() the page list must be put
back using unpin_user_pages() otherwise the page pin reference persists
in a corrupted state.

There are two places in the unwind of __gup_longterm_locked() that put
the pages back without checking.  Normally on error this function would
return the partial page list making this the caller's responsibility,
but in these two cases the caller is not allowed to see these pages at
all.

Fixes: 3faa52c0 ("mm/gup: track FOLL_PIN pages")
Reported-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: <stable@vger.kernel.org>
Link: https://lkml.kernel.org/r/0-v2-3ae7d9d162e2+2a7-gup_cma_fix_jgg@nvidia.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 22e4663e
...@@ -1647,8 +1647,11 @@ static long check_and_migrate_cma_pages(struct mm_struct *mm, ...@@ -1647,8 +1647,11 @@ static long check_and_migrate_cma_pages(struct mm_struct *mm,
/* /*
* drop the above get_user_pages reference. * drop the above get_user_pages reference.
*/ */
for (i = 0; i < nr_pages; i++) if (gup_flags & FOLL_PIN)
put_page(pages[i]); unpin_user_pages(pages, nr_pages);
else
for (i = 0; i < nr_pages; i++)
put_page(pages[i]);
if (migrate_pages(&cma_page_list, alloc_migration_target, NULL, if (migrate_pages(&cma_page_list, alloc_migration_target, NULL,
(unsigned long)&mtc, MIGRATE_SYNC, MR_CONTIG_RANGE)) { (unsigned long)&mtc, MIGRATE_SYNC, MR_CONTIG_RANGE)) {
...@@ -1728,8 +1731,11 @@ static long __gup_longterm_locked(struct mm_struct *mm, ...@@ -1728,8 +1731,11 @@ static long __gup_longterm_locked(struct mm_struct *mm,
goto out; goto out;
if (check_dax_vmas(vmas_tmp, rc)) { if (check_dax_vmas(vmas_tmp, rc)) {
for (i = 0; i < rc; i++) if (gup_flags & FOLL_PIN)
put_page(pages[i]); unpin_user_pages(pages, rc);
else
for (i = 0; i < rc; i++)
put_page(pages[i]);
rc = -EOPNOTSUPP; rc = -EOPNOTSUPP;
goto out; goto out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment