Skip to content

Commit d6b5a8d

Browse files
Sasha Levinakpm00
authored andcommitted
mm/ksm: fix pte_unmap_unlock of wrong address in break_ksm_pmd_entry
On ARM32 with HIGHMEM/HIGHPTE, break_ksm_pmd_entry() triggers a BUG during KSM unmerging because pte_unmap_unlock() is passed a pointer that may be beyond the mapped PTE page. The issue occurs when the PTE iteration loop completes without finding a KSM page. After the loop, 'ptep' has been incremented past the last PTE entry. On ARM32 LPAE with 512 PTEs per page (512 * 8 = 4096 bytes), this means ptep points to the next page, outside the kmap'd region. When pte_unmap_unlock(ptep, ptl) calls kunmap_local(ptep), it unmaps the wrong page address, leaving the original kmap slot still mapped. The next kmap_local then finds this slot unexpectedly occupied: WARNING: mm/highmem.c:622 kunmap_local_indexed (address mismatch) kernel BUG at mm/highmem.c:564 __kmap_local_pfn_prot (slot not empty) Fix this by passing start_ptep to pte_unmap_unlock(), which always points within the originally mapped PTE page. Reproducer: Run LTP ksm03 test on ARM32 with HIGHMEM enabled. The test triggers KSM merging followed by unmerging (writing 0 then 2 to /sys/kernel/mm/ksm/run), which exercises break_ksm_pmd_entry(). Link: https://lkml.kernel.org/r/[email protected] Fixes: 5d4939f ("ksm: perform a range-walk in break_ksm") Signed-off-by: Sasha Levin <[email protected]> Assisted-by: claude-opus-4-5-20251101 Acked-by: David Hildenbrand (Red Hat) <[email protected]> Reviewed-by: Chengming Zhou <[email protected]> Cc: Pedro Demarchi Gomes <[email protected]> Cc: xu xin <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent a76a5ae commit d6b5a8d

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

mm/ksm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ static int break_ksm_pmd_entry(pmd_t *pmdp, unsigned long addr, unsigned long en
650650
}
651651
}
652652
out_unlock:
653-
pte_unmap_unlock(ptep, ptl);
653+
pte_unmap_unlock(start_ptep, ptl);
654654
return found;
655655
}
656656

0 commit comments

Comments
 (0)