Commit 27447dad authored May 09, 2023 by Liviu Dudau Committed by Greg Kroah-Hartman Jun 21, 2023

mips: Move initrd_start check after initrd address sanitisation.



[ Upstream commit 4897a898a216058dec55e5e5902534e6e224fcdf ]

PAGE_OFFSET is technically a virtual address so when checking the value of
initrd_start against it we should make sure that it has been sanitised from
the values passed by the bootloader. Without this change, even with a bootloader
that passes correct addresses for an initrd, we are failing to load it on MT7621
boards, for example.

Signed-off-by: Liviu Dudau <liviu@dudau.co.uk>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent a365600b

arch/mips/kernel/setup.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -190,10 +190,6 @@ static unsigned long __init init_initrd(void)
		pr_err("initrd start must be page aligned\n");
		goto disable;
		}
		if (initrd_start < PAGE_OFFSET) {
		pr_err("initrd start < PAGE_OFFSET\n");
		goto disable;
		}

		/*
		* Sanitize initrd addresses. For example firmware
		@@ -206,6 +202,11 @@ static unsigned long __init init_initrd(void)
		initrd_end = (unsigned long)__va(end);
		initrd_start = (unsigned long)__va(__pa(initrd_start));

		if (initrd_start < PAGE_OFFSET) {
		pr_err("initrd start < PAGE_OFFSET\n");
		goto disable;
		}

		ROOT_DEV = Root_RAM0;
		return PFN_UP(end);
		disable: