From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793827173; b=Z+4mG/m+cAfw0NxaaZNNJKnearC/PKAbjPdJlINy9Quq7xyt+9HXM5lX28LDgrgSmXAy ly8EEc/bYbYNAAaVPL6crkZc3D/rx6r9K8pCb/HfOlfvk4d+LRbbu+ZlyhJN0Bh0xB6rt YeBXMLNZhEzsfE78jKQU8IRzVprfoIpwO+h1BgdtUoPdMDtQD3XHaEcJvXwmkO3LzQOjn OhSswOcpNTqoKlTg/DcKG0ISQAohjNBq2XGgjpwpRgLmfQBBjjkueBpZdmD3I/6ggmpMJ KdlWck8kpgLkGiv7KFroVzN8M6WN6cQ9Qf9FNrc0SZAIiai1/EkSwsNfohgQ1zrtkaw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793827173; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=0vm5Po7kkVeBftKxJC82HmgZX1ShHFrLr07VEZN6vDk=; b=PPp3fHNpWIzY++EacV4RMx1x/OAjZ4UF+60U2d/FlbQjGhoZrVFuiGeUZjLXOQlKZHrR MI4J0lxktWBt9R4alBXZhSJtIayWBbwqI51X6/lkUa8frgvRj1CWFtp5hpm14Ad/cidNJ muOKhN77m9zFprIIRmfz3TATNbSs4Yd+uvDJ+g9Hb98/OJTfs8qa+Vjll/TpK2jOG9vYf bN70Gn8X6lSdEhgHoV3ERkzH0pAcU4lGv6t+DsLRMnXi9UwR6LdfMECWR8IjYxo708OEt lUMY7V6vqR8EwY24XGN830pMw+ybM3AKNZUlMW81/NIwLaSMB9WoiWVFg+HuPxaalow== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=LRloP5vX; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB3516075241; Wed, 4 Nov 2026 21:19:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=LRloP5vX Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F0791F0093A; Wed, 4 Nov 2026 21:19:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793827172; bh=0vm5Po7kkVeBftKxJC82HmgZX1ShHFrLr07VEZN6vDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LRloP5vXRQs+fKRHX9hfoBD603WguDo5P8MhcZ3Se3LfB7lqn83sNRImP2ltZhama EzUeyjVpSlvVJ4JvzLny/LOf9pHXg+EzAv5RyTw+L0yJ70ou6Fjd1wxAxADKY0FFwS mJkPLFAYtLGjEOUJmB6ePHlPp1KgZwzL6N73VGCI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vernon Yang , Andrew Morton , "David Hildenbrand (Arm)" , Barry Song , Dev Jain , Lance Yang , Lorenzo Stoakes , Ryan Roberts , Zach OKeefe Subject: [PATCH 7.3 238/547] mm: khugepaged: fix swap entry value to folio_pfn() Date: Wed, 4 Nov 2026 16:07:02 -0500 Message-ID: <20261104211044.925771511@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261104211038.406938024@linuxfoundation.org> References: <20261104211038.406938024@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vernon Yang commit 942c8ec27aa4ffc587511650718349964e1696e6 upstream. Patch series "mm: khugepaged: fix tracepoint UAF", v5. 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(). This patch (of 3): When the swap entries found exceed max_ptes_swap, the loop is left via break with folio still holding the xarray value that encodes the swap entry, not valid folio pointer. That value is passed to trace_mm_khugepaged_scan_file(), which feeds it to folio_pfn(). On FLATMEM and SPARSEMEM_VMEMMAP, the page_to_pfn() is plain pointer arithmetic, so the trace event merely prints bogus scan_pfn. On classic SPARSEMEM, the page_to_pfn() reads page->flags, dereferencing the tiny encoded integer and oopsing khugepaged whenever the trace event is enabled. So when folio is the swap entry value, simply set pfn to -1, just like exhausted scan naturally. And the folio_put() has maybe dropped the last reference of folio. The trace_mm_khugepaged_scan_file() is left with a dangling folio pointer. so using the folio_pfn() before dropping the reference, closing use-after-free window. Link: https://lore.kernel.org/20260909025804.3233645-1-vernon2gm@gmail.com Link: https://lore.kernel.org/20260909025804.3233645-2-vernon2gm@gmail.com Fixes: d41fd2016ed0 ("mm/khugepaged: add tracepoint to hpage_collapse_scan_file()") Signed-off-by: Vernon Yang Signed-off-by: Andrew Morton Acked-by: David Hildenbrand (Arm) Cc: Barry Song Cc: Dev Jain Cc: Lance Yang Cc: Lorenzo Stoakes Cc: Ryan Roberts Cc: Zach O'Keefe Cc: Signed-off-by: Greg Kroah-Hartman --- include/trace/events/huge_memory.h | 6 +++--- mm/khugepaged.c | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) --- a/include/trace/events/huge_memory.h +++ b/include/trace/events/huge_memory.h @@ -178,10 +178,10 @@ TRACE_EVENT(mm_collapse_huge_page_swapin TRACE_EVENT(mm_khugepaged_scan_file, - TP_PROTO(struct mm_struct *mm, struct folio *folio, struct file *file, + TP_PROTO(struct mm_struct *mm, unsigned long pfn, struct file *file, int present, int swap, int result), - TP_ARGS(mm, folio, file, present, swap, result), + TP_ARGS(mm, pfn, file, present, swap, result), TP_STRUCT__entry( __field(struct mm_struct *, mm) @@ -194,7 +194,7 @@ TRACE_EVENT(mm_khugepaged_scan_file, TP_fast_assign( __entry->mm = mm; - __entry->pfn = folio ? folio_pfn(folio) : -1; + __entry->pfn = pfn; __assign_str(filename); __entry->present = present; __entry->swap = swap; --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2693,6 +2693,7 @@ static enum scan_result collapse_scan_fi int present, swap; int node = NUMA_NO_NODE; enum scan_result result = SCAN_SUCCEED; + unsigned long failed_pfn = -1; present = 0; swap = 0; @@ -2725,6 +2726,7 @@ static enum scan_result collapse_scan_fi if (is_pmd_order(folio_order(folio))) { result = SCAN_PTE_MAPPED_HUGEPAGE; + failed_pfn = folio_pfn(folio); /* * PMD-sized THP implies that we can only try * retracting the PTE table. @@ -2736,6 +2738,7 @@ static enum scan_result collapse_scan_fi node = folio_nid(folio); if (collapse_scan_abort(node, cc)) { result = SCAN_SCAN_ABORT; + failed_pfn = folio_pfn(folio); folio_put(folio); break; } @@ -2743,12 +2746,14 @@ static enum scan_result collapse_scan_fi if (!folio_test_lru(folio)) { result = SCAN_PAGE_LRU; + failed_pfn = folio_pfn(folio); folio_put(folio); break; } if (folio_expected_ref_count(folio) + 1 != folio_ref_count(folio)) { result = SCAN_PAGE_COUNT; + failed_pfn = folio_pfn(folio); folio_put(folio); break; } @@ -2783,7 +2788,7 @@ static enum scan_result collapse_scan_fi } } - trace_mm_khugepaged_scan_file(mm, folio, file, present, swap, result); + trace_mm_khugepaged_scan_file(mm, failed_pfn, file, present, swap, result); return result; }