Commit f55ab8f2 authored Sep 05, 2017 by Greg Ungerer

m68k: fix ColdFire node shift size calculation

The m68k pg_data_table is a fix size array defined in arch/m68k/mm/init.c.
Index numbers within it are defined based on memory size. But for Coldfire
these don't take into account a non-zero physical RAM base address, and this
causes us to access past the end of this array at system start time.

Change the node shift calculation so that we keep the index inside its range.

Reported-by: Angelo Dureghello <angelo@sysam.it>
Tested-by: Angelo Dureghello <angelo@sysam.it>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>

parent 34fa9b21

arch/m68k/mm/mcfmmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@ void __init cf_bootmem_alloc(void)
		max_pfn = max_low_pfn = PFN_DOWN(_ramend);
		high_memory = (void *)_ramend;

		m68k_virt_to_node_shift = fls(_ramend - _rambase - 1) - 6;
		m68k_virt_to_node_shift = fls(_ramend - 1) - 6;
		module_fixup(NULL, __start_fixup, __stop_fixup);

		/* setup bootmem data */

Admin message