Skip to content

Commit 12f0cd3

Browse files
ljskernelakpm00
authored andcommitted
fs/proc/task_mmu.c: fix make_uffd_wp_huge_pte() huge pte handling
make_uffd_wp_huge_pte() should return after handling a huge_pte_none() pte. Link: https://lkml.kernel.org/r/66178124-ebdf-4e23-b8ca-ed3eb8030c81@lucifer.local Fixes: 03bfbc3 ("mm: remove is_hugetlb_entry_[migration, hwpoisoned]()") Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Reported-by: Vlastimil Babka <vbabka@suse.cz> Closes: https://lkml.kernel.org/r/dc483db3-be4d-45f7-8b40-a28f5d8f5738@suse.cz Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent ce2bba8 commit 12f0cd3

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

fs/proc/task_mmu.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2500,9 +2500,11 @@ static void make_uffd_wp_huge_pte(struct vm_area_struct *vma,
25002500
const unsigned long psize = huge_page_size(hstate_vma(vma));
25012501
softleaf_t entry;
25022502

2503-
if (huge_pte_none(ptent))
2503+
if (huge_pte_none(ptent)) {
25042504
set_huge_pte_at(vma->vm_mm, addr, ptep,
25052505
make_pte_marker(PTE_MARKER_UFFD_WP), psize);
2506+
return;
2507+
}
25062508

25072509
entry = softleaf_from_pte(ptent);
25082510
if (softleaf_is_hwpoison(entry) || softleaf_is_marker(entry))

0 commit comments

Comments
 (0)