Commit a08ebda9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-2024-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock 

Pull memblock fix from Mike Rapoport:
 "Fix crash when reserved memory is not added to memory.

  When CONFIG_DEFERRED_STRUCT_PAGE_INIT is enabled, the initialization
  of reserved pages may cause access of NODE_DATA() with invalid nid and
  crash.

  Add a fall back to early_pfn_to_nid() in memmap_init_reserved_pages()
  to ensure a valid node id is always passed to init_reserved_page()"

* tag 'fixes-2024-01-28' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock:
  memblock: fix crash when reserved memory is not added to memory
parents 8a696a29 6a9531c3

mm/memblock.c

+3 −0
Original line number Diff line number Diff line
@@ -2176,6 +2176,9 @@ static void __init memmap_init_reserved_pages(void) 
			start = region->base;

			end = start + region->size;



			if (nid == NUMA_NO_NODE || nid >= MAX_NUMNODES)

				nid = early_pfn_to_nid(PFN_DOWN(start));



			reserve_bootmem_region(start, end, nid);

		}

	}