Commit 9d9a2f29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2024-07-10-13-19' of... 

Merge tag 'mm-hotfixes-stable-2024-07-10-13-19' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "21 hotfixes, 15 of which are cc:stable.

  No identifiable theme here - all are singleton patches, 19 are for MM"

* tag 'mm-hotfixes-stable-2024-07-10-13-19' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (21 commits)
  mm/hugetlb: fix kernel NULL pointer dereference when migrating hugetlb folio
  mm/hugetlb: fix potential race in __update_and_free_hugetlb_folio()
  filemap: replace pte_offset_map() with pte_offset_map_nolock()
  arch/xtensa: always_inline get_current() and current_thread_info()
  sched.h: always_inline alloc_tag_{save|restore} to fix modpost warnings
  MAINTAINERS: mailmap: update Lorenzo Stoakes's email address
  mm: fix crashes from deferred split racing folio migration
  lib/build_OID_registry: avoid non-destructive substitution for Perl < 5.13.2 compat
  mm: gup: stop abusing try_grab_folio
  nilfs2: fix kernel bug on rename operation of broken directory
  mm/hugetlb_vmemmap: fix race with speculative PFN walkers
  cachestat: do not flush stats in recency check
  mm/shmem: disable PMD-sized page cache if needed
  mm/filemap: skip to create PMD-sized page cache if needed
  mm/readahead: limit page cache size in page_cache_ra_order()
  mm/filemap: make MAX_PAGECACHE_ORDER acceptable to xarray
  mm/damon/core: merge regions aggressively when max_nr_regions is unmet
  Fix userfaultfd_api to return EINVAL as expected
  mm: vmalloc: check if a hash-index is in cpu_possible_mask
  mm: prevent derefencing NULL ptr in pfn_section_valid()
  ...
parents ef2b7eb5 f708f697

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ 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>

Lorenzo Pieralisi <lpieralisi@kernel.org> <lorenzo.pieralisi@arm.com>

Lorenzo Stoakes <lorenzo.stoakes@oracle.com> <lstoakes@gmail.com>

Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net>

Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>

Luo Jie <quic_luoj@quicinc.com> <luoj@codeaurora.org>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -14472,7 +14472,7 @@ MEMORY MAPPING 
M:	Andrew Morton <akpm@linux-foundation.org>

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

R:	Vlastimil Babka <vbabka@suse.cz>

R:	Lorenzo Stoakes <lstoakes@gmail.com>

R:	Lorenzo Stoakes <lorenzo.stoakes@oracle.com>

L:	linux-mm@kvack.org

S:	Maintained

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

arch/xtensa/include/asm/current.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


struct task_struct;



static inline struct task_struct *get_current(void)

static __always_inline struct task_struct *get_current(void)

{

	return current_thread_info()->task;

}

arch/xtensa/include/asm/thread_info.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ struct thread_info { 
}



/* how to get the thread information struct from C */

static inline struct thread_info *current_thread_info(void)

static __always_inline struct thread_info *current_thread_info(void)

{

	struct thread_info *ti;

	 __asm__("extui %0, a1, 0, "__stringify(CURRENT_SHIFT)"\n\t"

fs/nilfs2/dir.c

+30 −2
Original line number Diff line number Diff line
@@ -383,11 +383,39 @@ struct nilfs_dir_entry *nilfs_find_entry(struct inode *dir, 


struct nilfs_dir_entry *nilfs_dotdot(struct inode *dir, struct folio **foliop)

{

	struct nilfs_dir_entry *de = nilfs_get_folio(dir, 0, foliop);

	struct folio *folio;

	struct nilfs_dir_entry *de, *next_de;

	size_t limit;

	char *msg;



	de = nilfs_get_folio(dir, 0, &folio);

	if (IS_ERR(de))

		return NULL;

	return nilfs_next_entry(de);



	limit = nilfs_last_byte(dir, 0);  /* is a multiple of chunk size */

	if (unlikely(!limit || le64_to_cpu(de->inode) != dir->i_ino ||

		     !nilfs_match(1, ".", de))) {

		msg = "missing '.'";

		goto fail;

	}



	next_de = nilfs_next_entry(de);

	/*

	 * If "next_de" has not reached the end of the chunk, there is

	 * at least one more record.  Check whether it matches "..".

	 */

	if (unlikely((char *)next_de == (char *)de + nilfs_chunk_size(dir) ||

		     !nilfs_match(2, "..", next_de))) {

		msg = "missing '..'";

		goto fail;

	}

	*foliop = folio;

	return next_de;



fail:

	nilfs_error(dir->i_sb, "directory #%lu %s", dir->i_ino, msg);

	folio_release_kmap(folio, de);

	return NULL;

}



ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr)