linux-kernel - Re: [PATCH v3 14/16] mm: remove is_hugetlb_entry

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20251127113337.c6a897e0b786d56084d23025@linux-foundation.org>
Date: Thu, 27 Nov 2025 11:33:37 -0800
From: Andrew Morton <akpm@...ux-foundation.org>
To: Lorenzo Stoakes <lorenzo.stoakes@...cle.com>
Cc: Christian Borntraeger <borntraeger@...ux.ibm.com>, Janosch Frank
 <frankja@...ux.ibm.com>, Claudio Imbrenda <imbrenda@...ux.ibm.com>, David
 Hildenbrand <david@...hat.com>, Alexander Gordeev <agordeev@...ux.ibm.com>,
 Gerald Schaefer <gerald.schaefer@...ux.ibm.com>, Heiko Carstens
 <hca@...ux.ibm.com>, Vasily Gorbik <gor@...ux.ibm.com>, Sven Schnelle
 <svens@...ux.ibm.com>, Peter Xu <peterx@...hat.com>, Alexander Viro
 <viro@...iv.linux.org.uk>, Christian Brauner <brauner@...nel.org>, Jan Kara
 <jack@...e.cz>, Arnd Bergmann <arnd@...db.de>, Zi Yan <ziy@...dia.com>,
 Baolin Wang <baolin.wang@...ux.alibaba.com>, "Liam R . Howlett"
 <Liam.Howlett@...cle.com>, Nico Pache <npache@...hat.com>, Ryan Roberts
 <ryan.roberts@....com>, Dev Jain <dev.jain@....com>, Barry Song
 <baohua@...nel.org>, Lance Yang <lance.yang@...ux.dev>, Muchun Song
 <muchun.song@...ux.dev>, Oscar Salvador <osalvador@...e.de>, Vlastimil
 Babka <vbabka@...e.cz>, Mike Rapoport <rppt@...nel.org>, Suren Baghdasaryan
 <surenb@...gle.com>, Michal Hocko <mhocko@...e.com>, Matthew Brost
 <matthew.brost@...el.com>, Joshua Hahn <joshua.hahnjy@...il.com>, Rakie Kim
 <rakie.kim@...com>, Byungchul Park <byungchul@...com>, Gregory Price
 <gourry@...rry.net>, Ying Huang <ying.huang@...ux.alibaba.com>, Alistair
 Popple <apopple@...dia.com>, Axel Rasmussen <axelrasmussen@...gle.com>,
 Yuanchu Xie <yuanchu@...gle.com>, Wei Xu <weixugc@...gle.com>, Kemeng Shi
 <shikemeng@...weicloud.com>, Kairui Song <kasong@...cent.com>, Nhat Pham
 <nphamcs@...il.com>, Baoquan He <bhe@...hat.com>, Chris Li
 <chrisl@...nel.org>, SeongJae Park <sj@...nel.org>, Matthew Wilcox
 <willy@...radead.org>, Jason Gunthorpe <jgg@...pe.ca>, Leon Romanovsky
 <leon@...nel.org>, Xu Xin <xu.xin16@....com.cn>, Chengming Zhou
 <chengming.zhou@...ux.dev>, Jann Horn <jannh@...gle.com>, Miaohe Lin
 <linmiaohe@...wei.com>, Naoya Horiguchi <nao.horiguchi@...il.com>, Pedro
 Falcato <pfalcato@...e.de>, Pasha Tatashin <pasha.tatashin@...een.com>, Rik
 van Riel <riel@...riel.com>, Harry Yoo <harry.yoo@...cle.com>, Hugh Dickins
 <hughd@...gle.com>, linux-kernel@...r.kernel.org, kvm@...r.kernel.org,
 linux-s390@...r.kernel.org, linux-fsdevel@...r.kernel.org,
 linux-mm@...ck.org, linux-arch@...r.kernel.org, damon@...ts.linux.dev
Subject: Re: [PATCH v3 14/16] mm: remove is_hugetlb_entry_[migration,
 hwpoisoned]()

On Thu, 27 Nov 2025 17:45:17 +0000 Lorenzo Stoakes <lorenzo.stoakes@...cle.com> wrote:

> Hi Andrew,
> 
> Please apply this fix.
> 

The offending patch is in mm-stable now, so I'll do this as a
hey-git-made-me-add-a-bisection-hole commit.

From: Lorenzo Stoakes <lorenzo.stoakes@...cle.com>
Subject: fs/proc/task_mmu.c: fix make_uffd_wp_huge_pte() huge pte handling
Date: Thu, 27 Nov 2025 17:45:17 +0000

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: 03bfbc3ad6e4 ("mm: remove is_hugetlb_entry_[migration, hwpoisoned]()")
Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@...cle.com>
Reported-by: Vlastimil Babka <vbabka@...e.cz>
Closes: https://lkml.kernel.org/r/dc483db3-be4d-45f7-8b40-a28f5d8f5738@suse.cz
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---

 fs/proc/task_mmu.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/fs/proc/task_mmu.c~fs-proc-task_mmuc-fix-make_uffd_wp_huge_pte-huge-pte-handling
+++ a/fs/proc/task_mmu.c
@@ -2500,9 +2500,11 @@ static void make_uffd_wp_huge_pte(struct
 	const unsigned long psize = huge_page_size(hstate_vma(vma));
 	softleaf_t entry;

-	if (huge_pte_none(ptent))
+	if (huge_pte_none(ptent)) {
 		set_huge_pte_at(vma->vm_mm, addr, ptep,
 				make_pte_marker(PTE_MARKER_UFFD_WP), psize);
+		return;
+	}

 	entry = softleaf_from_pte(ptent);
 	if (softleaf_is_hwpoison(entry) || softleaf_is_marker(entry))
_