Re: [PATCH v2 0/3] mm: khugepaged: fix tracepoint UAF
Lance Yang <[email protected]>
| Newsgroups | gmane.linux.kernel,gmane.linux.kernel.mm |
|---|---|
| Message-ID | <[email protected]> |
+Cc Baolin On Sun, Aug 16, 2026 at 01:44:44AM +0800, Lance Yang wrote: > >On Sat, Aug 15, 2026 at 01:19:21PM +0800, Vernon Yang wrote: >>From: Vernon Yang <[email protected]> >> >>The khugepaged tracepoints take a folio pointer and call folio_pfn(), >>but by then the folio may no longer be valid: freed after folio_put(), >>folio_unlock() or pte_unmap_unlock(), or not a folio at all but an >>xarray-encoded swap entry. On classic SPARSEMEM, dereferencing it oopses >>khugepaged as soon as the trace event is enabled; on other memory models >>it merely prints a bogus pfn. >> >>Pass the pfn to the tracepoints directly, captured while the folio is >>still pinned, closing the use-after-free windows in >>mm_khugepaged_scan_file(), mm_khugepaged_scan_pmd() and >>mm_khugepaged_collapse_file(). > >Well spotted! > >Gave the series a run on x86_64 (KVM), all good (only classic SPARSEMEM >untested) :) Hmm ... stumbled over something else while testing this ... With tmpfs mounted huge=advise, one MADV_HUGEPAGE isn't enough to get an unregistered mm onto khugepaged's list. Do it twice, and khugepaged starts scanning right away. The pending flags make it into khugepaged just fine: int hugepage_madvise(struct vm_area_struct *vma, vm_flags_t *vm_flags, int advice) { switch (advice) { case MADV_HUGEPAGE: *vm_flags &= ~VM_NOHUGEPAGE; *vm_flags |= VM_HUGEPAGE; ... khugepaged_enter_vma(vma, *vm_flags); break; ... } return 0; } and survive the common eligibility check: unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, vm_flags_t vm_flags, enum tva_type type, unsigned long orders) { ... /* * Enabled via shmem mount options or sysfs settings. * Must be done before hugepage flags check since shmem has its * own flags. */ if (!in_pf && shmem_file(vma->vm_file)) return orders & shmem_allowable_huge_orders(file_inode(vma->vm_file), vma, vma_start_pgoff(vma), 0, forced_collapse); ... } But then the shmem helper reads them back from the VMA: unsigned long shmem_allowable_huge_orders(struct inode *inode, struct vm_area_struct *vma, pgoff_t index, loff_t write_end, bool shmem_huge_force) { ... vm_flags_t vm_flags = vma ? vma->vm_flags : 0; ... } At that point vma->vm_flags still has the old value, so huge=advise quietly gives us no allowable order. First madvise still succeeds, of course. The second one works because it finds VM_HUGEPAGE already installed by the first call. Looked at history too ... we've been here before. 2cf1338454a8 ("mm: fix khugepaged with shmem_enabled=advise") fixed this exact ordering bug and tagged cd89fb065099 as the culprit. Then 6beeab870e70 was meant to be "No functional changes", but moving shmem_huge_global_enabled() into shmem_allowable_huge_orders() seems to have wired the stale vma->vm_flags read back in. So AFAICT, this regressed in v6.12 with 6beeab870e70. @Baolin, does that ring a bell? Any reason shmem_allowable_huge_orders() can't just take the pending vm_flags as well? Cheers, Lance