Skip to content

Commit a08ebda

Browse files
committed
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
2 parents 8a696a2 + 6a9531c commit a08ebda

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

mm/memblock.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2176,6 +2176,9 @@ static void __init memmap_init_reserved_pages(void)
21762176
start = region->base;
21772177
end = start + region->size;
21782178

2179+
if (nid == NUMA_NO_NODE || nid >= MAX_NUMNODES)
2180+
nid = early_pfn_to_nid(PFN_DOWN(start));
2181+
21792182
reserve_bootmem_region(start, end, nid);
21802183
}
21812184
}

0 commit comments

Comments
 (0)