Commit 911b2b95 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "9 patches.

  Subsystems affected by this patch series: mm (migration, highmem,
  sparsemem, mremap, mempolicy, and memcg), lz4, mailmap, and
  MAINTAINERS"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  MAINTAINERS: add Tom as clang reviewer
  mm/list_lru.c: revert "mm/list_lru: optimize memcg_reparent_list_lru_node()"
  mailmap: update Vasily Averin's email address
  mm/mempolicy: fix mpol_new leak in shared_policy_replace
  mmmremap.c: avoid pointless invalidate_range_start/end on mremap(old_size=0)
  mm/sparsemem: fix 'mem_section' will never be NULL gcc 12 warning
  lz4: fix LZ4_decompress_safe_partial read out of bound
  highmem: fix checks in __kmap_local_sched_{in,out}
  mm: migrate: use thp_order instead of HPAGE_PMD_ORDER for new page allocation.
parents 1a3b1bba 4071a1b9

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -391,6 +391,10 @@ Uwe Kleine-König <ukleinek@strlen.de> 
Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Vasily Averin <vasily.averin@linux.dev> <vvs@virtuozzo.com>

Vasily Averin <vasily.averin@linux.dev> <vvs@openvz.org>

Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com>

Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru>

Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>

Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>

Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4791,6 +4791,7 @@ F: .clang-format 
CLANG/LLVM BUILD SUPPORT

M:	Nathan Chancellor <nathan@kernel.org>

M:	Nick Desaulniers <ndesaulniers@google.com>

R:	Tom Rix <trix@redhat.com>

L:	llvm@lists.linux.dev

S:	Supported

W:	https://clangbuiltlinux.github.io/

include/linux/mmzone.h

+7 −4
Original line number Diff line number Diff line
@@ -1397,13 +1397,16 @@ static inline unsigned long *section_to_usemap(struct mem_section *ms) 


static inline struct mem_section *__nr_to_section(unsigned long nr)

{

	unsigned long root = SECTION_NR_TO_ROOT(nr);



	if (unlikely(root >= NR_SECTION_ROOTS))

		return NULL;



#ifdef CONFIG_SPARSEMEM_EXTREME

	if (!mem_section)

	if (!mem_section || !mem_section[root])

		return NULL;

#endif

	if (!mem_section[SECTION_NR_TO_ROOT(nr)])

		return NULL;

	return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK];

	return &mem_section[root][nr & SECTION_ROOT_MASK];

}

extern size_t mem_section_usage_size(void);

lib/lz4/lz4_decompress.c

+6 −2
Original line number Diff line number Diff line
@@ -271,8 +271,12 @@ static FORCE_INLINE int LZ4_decompress_generic( 
			ip += length;

			op += length;



			/* Necessarily EOF, due to parsing restrictions */

			if (!partialDecoding || (cpy == oend))

			/* Necessarily EOF when !partialDecoding.

			 * When partialDecoding, it is EOF if we've either

			 * filled the output buffer or

			 * can't proceed with reading an offset for following match.

			 */

			if (!partialDecoding || (cpy == oend) || (ip >= (iend - 2)))

				break;

		} else {

			/* may overwrite up to WILDCOPYLENGTH beyond cpy */

mm/highmem.c

+2 −2
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ void __kmap_local_sched_out(void) 


		/* With debug all even slots are unmapped and act as guard */

		if (IS_ENABLED(CONFIG_DEBUG_KMAP_LOCAL) && !(i & 0x01)) {

			WARN_ON_ONCE(!pte_none(pteval));

			WARN_ON_ONCE(pte_val(pteval) != 0);

			continue;

		}

		if (WARN_ON_ONCE(pte_none(pteval)))
@@ -661,7 +661,7 @@ void __kmap_local_sched_in(void) 


		/* With debug all even slots are unmapped and act as guard */

		if (IS_ENABLED(CONFIG_DEBUG_KMAP_LOCAL) && !(i & 0x01)) {

			WARN_ON_ONCE(!pte_none(pteval));

			WARN_ON_ONCE(pte_val(pteval) != 0);

			continue;

		}

		if (WARN_ON_ONCE(pte_none(pteval)))