Skip to content

Commit 3f08842

Browse files
Shijie Luotorvalds
authored andcommitted
mm: mempolicy: fix potential pte_unmap_unlock pte error
When flags in queue_pages_pte_range don't have MPOL_MF_MOVE or MPOL_MF_MOVE_ALL bits, code breaks and passing origin pte - 1 to pte_unmap_unlock seems like not a good idea. queue_pages_pte_range can run in MPOL_MF_MOVE_ALL mode which doesn't migrate misplaced pages but returns with EIO when encountering such a page. Since commit a7f40cf ("mm: mempolicy: make mbind() return -EIO when MPOL_MF_STRICT is specified") and early break on the first pte in the range results in pte_unmap_unlock on an underflow pte. This can lead to lockups later on when somebody tries to lock the pte resp. page_table_lock again.. Fixes: a7f40cf ("mm: mempolicy: make mbind() return -EIO when MPOL_MF_STRICT is specified") Signed-off-by: Shijie Luo <luoshijie1@huawei.com> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Oscar Salvador <osalvador@suse.de> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Miaohe Lin <linmiaohe@huawei.com> Cc: Feilong Lin <linfeilong@huawei.com> Cc: Shijie Luo <luoshijie1@huawei.com> Cc: <stable@vger.kernel.org> Link: https://lkml.kernel.org/r/20201019074853.50856-1-luoshijie1@huawei.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 58b999d commit 3f08842

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

mm/mempolicy.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ static int queue_pages_pte_range(pmd_t *pmd, unsigned long addr,
525525
unsigned long flags = qp->flags;
526526
int ret;
527527
bool has_unmovable = false;
528-
pte_t *pte;
528+
pte_t *pte, *mapped_pte;
529529
spinlock_t *ptl;
530530

531531
ptl = pmd_trans_huge_lock(pmd, vma);
@@ -539,7 +539,7 @@ static int queue_pages_pte_range(pmd_t *pmd, unsigned long addr,
539539
if (pmd_trans_unstable(pmd))
540540
return 0;
541541

542-
pte = pte_offset_map_lock(walk->mm, pmd, addr, &ptl);
542+
mapped_pte = pte = pte_offset_map_lock(walk->mm, pmd, addr, &ptl);
543543
for (; addr != end; pte++, addr += PAGE_SIZE) {
544544
if (!pte_present(*pte))
545545
continue;
@@ -571,7 +571,7 @@ static int queue_pages_pte_range(pmd_t *pmd, unsigned long addr,
571571
} else
572572
break;
573573
}
574-
pte_unmap_unlock(pte - 1, ptl);
574+
pte_unmap_unlock(mapped_pte, ptl);
575575
cond_resched();
576576

577577
if (has_unmovable)

0 commit comments

Comments
 (0)