Commit 2b4d0215 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2026-04-30-15-39' of... 

Merge tag 'mm-hotfixes-stable-2026-04-30-15-39' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull MM fixes from Andrew Morton:
 "20 hotfixes. All are for MM (and for MMish maintainers). 9 are
  cc:stable and the remainder are for post-7.0 issues or aren't deemed
  suitable for backporting.

  There are two DAMON series from SeongJae Park which address races
  which could lead to use-after-free errors, and avoid the possibility
  of presenting stale parameter values to users"

* tag 'mm-hotfixes-stable-2026-04-30-15-39' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  mm: memcontrol: fix rcu unbalance in get_non_dying_memcg_end()
  mm/userfaultfd: detect VMA type change after copy retry in mfill_copy_folio_retry()
  MAINTAINERS: remove stale kdump project URL
  mm/damon/stat: detect and use fresh enabled value
  mm/damon/lru_sort: detect and use fresh enabled and kdamond_pid values
  mm/damon/reclaim: detect and use fresh enabled and kdamond_pid values
  selftests/mm: specify requirement for PROC_MEM_ALWAYS_FORCE=y
  mm/damon/sysfs-schemes: protect path kfree() with damon_sysfs_lock
  mm/damon/sysfs-schemes: protect memcg_path kfree() with damon_sysfs_lock
  MAINTAINERS: update Li Wang's email address
  MAINTAINERS, mailmap: update email address for Qi Zheng
  MAINTAINERS: update Liam's email address
  mm/hugetlb_cma: round up per_node before logging it
  MAINTAINERS: fix regex pattern in CORE MM category
  mm/vma: do not try to unmap a VMA if mmap_prepare() invoked from mmap()
  mm: start background writeback based on per-wb threshold for strictlimit BDIs
  kho: fix error handling in kho_add_subtree()
  liveupdate: fix return value on session allocation failure
  mailmap: update entry for Dan Carpenter
  vmalloc: fix buffer overflow in vrealloc_node_align()
parents 26fd6bff 99ebc509

.mailmap

+5 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ Claudiu Beznea <claudiu.beznea@tuxon.dev> <claudiu.beznea@microchip.com> 
Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

Dan Carpenter <error27@gmail.com> <dan.carpenter@linaro.org>

Dan Carpenter <error27@gmail.com> <dan.carpenter@oracle.com>

Dan Williams <djbw@kernel.org> <dan.j.williams@intel.com>

Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
@@ -495,6 +496,7 @@ Leon Romanovsky <leon@kernel.org> <leon@leon.nu> 
Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>

Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>

Leo Yan <leo.yan@linux.dev> <leo.yan@linaro.org>

Liam R. Howlett <liam@infradead.org> <Liam.Howlett@oracle.com>

Liam Mark <quic_lmark@quicinc.com> <lmark@codeaurora.org>

Linas Vepstas <linas@austin.ibm.com>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
@@ -505,6 +507,8 @@ Linus Walleij <linusw@kernel.org> <linus.walleij@stericsson.com> 
Linus Walleij <linusw@kernel.org> <linus.walleij@linaro.org>

Linus Walleij <linusw@kernel.org> <triad@df.lth.se>

<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>

Li Wang <li.wang@linux.dev> <liwang@redhat.com>

Li Wang <li.wang@linux.dev> <wangli.ahau@gmail.com>

Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>

Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>

Lior David <quic_liord@quicinc.com> <liord@codeaurora.org>
@@ -687,6 +691,7 @@ Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com> 
Puranjay Mohan <puranjay@kernel.org> <puranjay12@gmail.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>

Qi Zheng <qi.zheng@linux.dev> <zhengqi.arch@bytedance.com>

Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>

Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

MAINTAINERS

+15 −15
Original line number Diff line number Diff line
@@ -13860,7 +13860,6 @@ M: Pratyush Yadav <pratyush@kernel.org> 
R:	Dave Young <ruirui.yang@linux.dev>

L:	kexec@lists.infradead.org

S:	Maintained

W:	http://lse.sourceforge.net/kdump/

F:	Documentation/admin-guide/kdump/

F:	fs/proc/vmcore.c

F:	include/linux/crash_core.h
@@ -15252,7 +15251,7 @@ M: Andrea Cervesato <andrea.cervesato@suse.com> 
M:	Cyril Hrubis <chrubis@suse.cz>

M:	Jan Stancek <jstancek@redhat.com>

M:	Petr Vorel <pvorel@suse.cz>

M:	Li Wang <liwang@redhat.com>

M:	Li Wang <li.wang@linux.dev>

M:	Yang Xu <xuyang2018.jy@fujitsu.com>

M:	Xiao Yang <yangx.jy@fujitsu.com>

L:	ltp@lists.linux.it (subscribers-only)
@@ -15399,7 +15398,7 @@ F: include/net/netns/mctp.h 
F:	net/mctp/









MAPLE TREE









M:	Liam R. Howlett <Liam.Howlett@oracle.com>









M:	Liam R. Howlett <liam@infradead.org>









R:	Alice Ryhl <aliceryhl@google.com>









R:	Andrew Ballance <andrewjballance@gmail.com>









L:	maple-tree@lists.infradead.org








@@ -16759,7 +16758,7 @@ MEMORY MANAGEMENT - CORE







M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@kernel.org>









R:	Lorenzo Stoakes <ljs@kernel.org>









R:	Liam R. Howlett <Liam.Howlett@oracle.com>









R:	Liam R. Howlett <liam@infradead.org>









R:	Vlastimil Babka <vbabka@kernel.org>









R:	Mike Rapoport <rppt@kernel.org>









R:	Suren Baghdasaryan <surenb@google.com>








@@ -16805,7 +16804,7 @@ F:	mm/sparse.c







F:	mm/util.c









F:	mm/vmpressure.c









F:	mm/vmstat.c









N:	include/linux/page[-_]*









N:	include\/linux\/page[-_][a-zA-Z]*

















MEMORY MANAGEMENT - EXECMEM









M:	Andrew Morton <akpm@linux-foundation.org>








@@ -16895,7 +16894,7 @@ MEMORY MANAGEMENT - MISC







M:	Andrew Morton <akpm@linux-foundation.org>









M:	David Hildenbrand <david@kernel.org>









R:	Lorenzo Stoakes <ljs@kernel.org>









R:	Liam R. Howlett <Liam.Howlett@oracle.com>









R:	Liam R. Howlett <liam@infradead.org>









R:	Vlastimil Babka <vbabka@kernel.org>









R:	Mike Rapoport <rppt@kernel.org>









R:	Suren Baghdasaryan <surenb@google.com>








@@ -16962,6 +16961,7 @@ S:	Maintained







F:	include/linux/compaction.h









F:	include/linux/gfp.h









F:	include/linux/page-isolation.h









F:	include/linux/pageblock-flags.h









F:	mm/compaction.c









F:	mm/debug_page_alloc.c









F:	mm/debug_page_ref.c








@@ -16983,7 +16983,7 @@ M:	Andrew Morton <akpm@linux-foundation.org>







M:	Johannes Weiner <hannes@cmpxchg.org>









R:	David Hildenbrand <david@kernel.org>









R:	Michal Hocko <mhocko@kernel.org>









R:	Qi Zheng <zhengqi.arch@bytedance.com>









R:	Qi Zheng <qi.zheng@linux.dev>









R:	Shakeel Butt <shakeel.butt@linux.dev>









R:	Lorenzo Stoakes <ljs@kernel.org>









L:	linux-mm@kvack.org








@@ -16996,7 +16996,7 @@ M:	Andrew Morton <akpm@linux-foundation.org>







M:	David Hildenbrand <david@kernel.org>









M:	Lorenzo Stoakes <ljs@kernel.org>









R:	Rik van Riel <riel@surriel.com>









R:	Liam R. Howlett <Liam.Howlett@oracle.com>









R:	Liam R. Howlett <liam@infradead.org>









R:	Vlastimil Babka <vbabka@kernel.org>









R:	Harry Yoo <harry@kernel.org>









R:	Jann Horn <jannh@google.com>








@@ -17043,7 +17043,7 @@ M:	David Hildenbrand <david@kernel.org>







M:	Lorenzo Stoakes <ljs@kernel.org>









R:	Zi Yan <ziy@nvidia.com>









R:	Baolin Wang <baolin.wang@linux.alibaba.com>









R:	Liam R. Howlett <Liam.Howlett@oracle.com>









R:	Liam R. Howlett <liam@infradead.org>









R:	Nico Pache <npache@redhat.com>









R:	Ryan Roberts <ryan.roberts@arm.com>









R:	Dev Jain <dev.jain@arm.com>








@@ -17081,7 +17081,7 @@ F:	tools/testing/selftests/mm/uffd-*.[ch]







MEMORY MANAGEMENT - RUST









M:	Alice Ryhl <aliceryhl@google.com>









R:	Lorenzo Stoakes <ljs@kernel.org>









R:	Liam R. Howlett <Liam.Howlett@oracle.com>









R:	Liam R. Howlett <liam@infradead.org>









L:	linux-mm@kvack.org









L:	rust-for-linux@vger.kernel.org









S:	Maintained








@@ -17095,7 +17095,7 @@ F:	rust/kernel/page.rs















MEMORY MAPPING









M:	Andrew Morton <akpm@linux-foundation.org>









M:	Liam R. Howlett <Liam.Howlett@oracle.com>









M:	Liam R. Howlett <liam@infradead.org>









M:	Lorenzo Stoakes <ljs@kernel.org>









R:	Vlastimil Babka <vbabka@kernel.org>









R:	Jann Horn <jannh@google.com>








@@ -17127,7 +17127,7 @@ F:	tools/testing/vma/







MEMORY MAPPING - LOCKING









M:	Andrew Morton <akpm@linux-foundation.org>









M:	Suren Baghdasaryan <surenb@google.com>









M:	Liam R. Howlett <Liam.Howlett@oracle.com>









M:	Liam R. Howlett <liam@infradead.org>









M:	Lorenzo Stoakes <ljs@kernel.org>









R:	Vlastimil Babka <vbabka@kernel.org>









R:	Shakeel Butt <shakeel.butt@linux.dev>








@@ -17142,7 +17142,7 @@ F:	mm/mmap_lock.c















MEMORY MAPPING - MADVISE (MEMORY ADVICE)









M:	Andrew Morton <akpm@linux-foundation.org>









M:	Liam R. Howlett <Liam.Howlett@oracle.com>









M:	Liam R. Howlett <liam@infradead.org>









M:	Lorenzo Stoakes <ljs@kernel.org>









M:	David Hildenbrand <david@kernel.org>









R:	Vlastimil Babka <vbabka@kernel.org>








@@ -23403,7 +23403,7 @@ RUST [ALLOC]







M:	Danilo Krummrich <dakr@kernel.org>









R:	Lorenzo Stoakes <ljs@kernel.org>









R:	Vlastimil Babka <vbabka@kernel.org>









R:	Liam R. Howlett <Liam.Howlett@oracle.com>









R:	Liam R. Howlett <liam@infradead.org>









R:	Uladzislau Rezki <urezki@gmail.com>









L:	rust-for-linux@vger.kernel.org









S:	Maintained








@@ -24348,7 +24348,7 @@ F:	include/media/i2c/rj54n1cb0c.h







SHRINKER









M:	Andrew Morton <akpm@linux-foundation.org>









M:	Dave Chinner <david@fromorbit.com>









R:	Qi Zheng <zhengqi.arch@bytedance.com>









R:	Qi Zheng <qi.zheng@linux.dev>









R:	Roman Gushchin <roman.gushchin@linux.dev>









R:	Muchun Song <muchun.song@linux.dev>









L:	linux-mm@kvack.org

























include/linux/maple_tree.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -4,7 +4,7 @@







/*









 * Maple Tree - An RCU-safe adaptive tree for storing ranges









 * Copyright (c) 2018-2022 Oracle









 * Authors:     Liam R. Howlett <Liam.Howlett@Oracle.com>









 * Authors:     Liam R. Howlett <liam@infradead.org>









 *              Matthew Wilcox <willy@infradead.org>









 */










































include/linux/mm.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -4391,7 +4391,7 @@ static inline void mmap_action_map_kernel_pages_full(struct vm_area_desc *desc,

















int mmap_action_prepare(struct vm_area_desc *desc);









int mmap_action_complete(struct vm_area_struct *vma,









			 struct mmap_action *action);









			 struct mmap_action *action, bool is_compat);



















/* Look up the first VMA which exactly match the interval vm_start ... vm_end */









static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
































kernel/liveupdate/kexec_handover.c



+13
−8






























Original line number
Diff line number
Diff line







@@ -762,19 +762,24 @@ int kho_add_subtree(const char *name, void *blob, size_t size)







		goto out_pack;









	}



















	err = fdt_setprop(root_fdt, off, KHO_SUB_TREE_PROP_NAME,









	fdt_err = fdt_setprop(root_fdt, off, KHO_SUB_TREE_PROP_NAME,









			      &phys, sizeof(phys));









	if (err < 0)









		goto out_pack;









	if (fdt_err < 0)









		goto out_del_node;



















	err = fdt_setprop(root_fdt, off, KHO_SUB_TREE_SIZE_PROP_NAME,









	fdt_err = fdt_setprop(root_fdt, off, KHO_SUB_TREE_SIZE_PROP_NAME,









			      &size_u64, sizeof(size_u64));









	if (err < 0)









		goto out_pack;









	if (fdt_err < 0)









		goto out_del_node;



















	WARN_ON_ONCE(kho_debugfs_blob_add(&kho_out.dbg, name, blob,









					  size, false));



















	err = 0;









	goto out_pack;



















out_del_node:









	fdt_del_node(root_fdt, off);









out_pack:









	fdt_pack(root_fdt);