[folded-merged] mm-khugepaged-remove-definition-of-struct-khugepaged_mm_slot-fix.patch removed from -mm tree

[Andrew Morton <akpm@linux-foundation.org>]

The quilt patch titled
     Subject: mm-khugepaged-remove-definition-of-struct-khugepaged_mm_slot-fix
has been removed from the -mm tree.  Its filename was
     mm-khugepaged-remove-definition-of-struct-khugepaged_mm_slot-fix.patch

This patch was dropped because it was folded into mm-khugepaged-remove-definition-of-struct-khugepaged_mm_slot.patch

------------------------------------------------------
From: Wei Yang <richard.weiyang@gmail.com>
Subject: mm-khugepaged-remove-definition-of-struct-khugepaged_mm_slot-fix
Date: Mon, 22 Sep 2025 00:28:34 +0000

fix use-after-free crash

Link: https://lkml.kernel.org/r/20250922002834.vz6ntj36e75ehkyp@master
Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Debugged-by: Lance Yang <lance.yang@linux.dev>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Barry Song <baohua@kernel.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Dev Jain <dev.jain@arm.com>
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Mariano Pache <npache@redhat.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: SeongJae Park <sj@kernel.org>
Cc: xu xin <xu.xin16@zte.com.cn>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/khugepaged.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- a/mm/khugepaged.c~mm-khugepaged-remove-definition-of-struct-khugepaged_mm_slot-fix
+++ a/mm/khugepaged.c
@@ -2508,8 +2508,7 @@ breakouterloop_mmap_lock:
 		 * mm_slot not pointing to the exiting mm.
 		 */
 		if (!list_is_last(&slot->mm_node, &khugepaged_scan.mm_head)) {
-			slot = list_next_entry(slot, mm_node);
-			khugepaged_scan.mm_slot = slot;
+			khugepaged_scan.mm_slot = list_next_entry(slot, mm_node);
 			khugepaged_scan.address = 0;
 		} else {
 			khugepaged_scan.mm_slot = NULL;
_

Patches currently in -mm which might be from richard.weiyang@gmail.com are

mm-compaction-fix-low_pfn-advance-on-isolating-hugetlb.patch
mm-ksm-get-mm_slot-by-mm_slot_entry-when-slot-is-null.patch
mm-khugepaged-remove-definition-of-struct-khugepaged_mm_slot.patch
mm-khugepaged-use-start_addr-addr-for-better-reading.patch