Commit 27b9989b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2025-06-13-21-56' of... 

Merge tag 'mm-hotfixes-stable-2025-06-13-21-56' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "9 hotfixes. 3 are cc:stable and the remainder address post-6.15 issues
  or aren't considered necessary for -stable kernels. Only 4 are for MM"

* tag 'mm-hotfixes-stable-2025-06-13-21-56' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  mm: add mmap_prepare() compatibility layer for nested file systems
  init: fix build warnings about export.h
  MAINTAINERS: add Barry as a THP reviewer
  drivers/rapidio/rio_cm.c: prevent possible heap overwrite
  mm: close theoretical race where stale TLB entries could linger
  mm/vma: reset VMA iterator on commit_merge() OOM failure
  docs: proc: update VmFlags documentation in smaps
  scatterlist: fix extraneous '@'-sign kernel-doc notation
  selftests/mm: skip failed memfd setups in gup_longterm
parents 4774cfe3 bb666b7c

Documentation/filesystems/proc.rst

+3 −1
Original line number Diff line number Diff line
@@ -584,7 +584,6 @@ encoded manner. The codes are the following: 
    ms    may share

    gd    stack segment growns down

    pf    pure PFN range

    dw    disabled write to the mapped file

    lo    pages are locked in memory

    io    memory mapped I/O area

    sr    sequential read advise provided
@@ -607,8 +606,11 @@ encoded manner. The codes are the following: 
    mt    arm64 MTE allocation tags are enabled

    um    userfaultfd missing tracking

    uw    userfaultfd wr-protect tracking

    ui    userfaultfd minor fault

    ss    shadow/guarded control stack page

    sl    sealed

    lf    lock on fault pages

    dp    always lazily freeable mapping

    ==    =======================================



Note that there is no guarantee that every flag and associated mnemonic will

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -15921,6 +15921,7 @@ R: Liam R. Howlett <Liam.Howlett@oracle.com> 
R:	Nico Pache <npache@redhat.com>

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

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

R:	Barry Song <baohua@kernel.org>

L:	linux-mm@kvack.org

S:	Maintained

W:	http://www.linux-mm.org

drivers/rapidio/rio_cm.c

+3 −0
Original line number Diff line number Diff line
@@ -783,6 +783,9 @@ static int riocm_ch_send(u16 ch_id, void *buf, int len) 
	if (buf == NULL || ch_id == 0 || len == 0 || len > RIO_MAX_MSG_SIZE)

		return -EINVAL;



	if (len < sizeof(struct rio_ch_chan_hdr))

		return -EINVAL;		/* insufficient data from user */



	ch = riocm_get_channel(ch_id);

	if (!ch) {

		riocm_error("%s(%d) ch_%d not found", current->comm,

include/linux/fs.h

+4 −2
Original line number Diff line number Diff line
@@ -2274,10 +2274,12 @@ static inline bool file_has_valid_mmap_hooks(struct file *file) 
	return true;

}



int compat_vma_mmap_prepare(struct file *file, struct vm_area_struct *vma);



static inline int call_mmap(struct file *file, struct vm_area_struct *vma)

{

	if (WARN_ON_ONCE(file->f_op->mmap_prepare))

		return -EINVAL;

	if (file->f_op->mmap_prepare)

		return compat_vma_mmap_prepare(file, vma);



	return file->f_op->mmap(file, vma);

}

include/linux/scatterlist.h

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static inline bool sg_is_last(struct scatterlist *sg) 
 * @sg:		The current sg entry

 *

 * Description:

 *   Usually the next entry will be @sg@ + 1, but if this sg element is part

 *   Usually the next entry will be @sg + 1, but if this sg element is part

 *   of a chained scatterlist, it could jump to the start of a new

 *   scatterlist array.

 *
@@ -254,7 +254,7 @@ static inline void __sg_chain(struct scatterlist *chain_sg, 
 * @sgl:	Second scatterlist

 *

 * Description:

 *   Links @prv@ and @sgl@ together, to form a longer scatterlist.

 *   Links @prv and @sgl together, to form a longer scatterlist.

 *

 **/

static inline void sg_chain(struct scatterlist *prv, unsigned int prv_nents,