mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 14:19:16 +00:00
mips: Move initrd_start check after initrd address sanitisation.
[ Upstream commit 4897a898a2
]
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>
This commit is contained in:
parent
dd035c08ee
commit
424fc90272
1 changed files with 5 additions and 4 deletions
|
@ -158,10 +158,6 @@ static unsigned long __init init_initrd(void)
|
||||||
pr_err("initrd start must be page aligned\n");
|
pr_err("initrd start must be page aligned\n");
|
||||||
goto disable;
|
goto disable;
|
||||||
}
|
}
|
||||||
if (initrd_start < PAGE_OFFSET) {
|
|
||||||
pr_err("initrd start < PAGE_OFFSET\n");
|
|
||||||
goto disable;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Sanitize initrd addresses. For example firmware
|
* Sanitize initrd addresses. For example firmware
|
||||||
|
@ -174,6 +170,11 @@ static unsigned long __init init_initrd(void)
|
||||||
initrd_end = (unsigned long)__va(end);
|
initrd_end = (unsigned long)__va(end);
|
||||||
initrd_start = (unsigned long)__va(__pa(initrd_start));
|
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;
|
ROOT_DEV = Root_RAM0;
|
||||||
return PFN_UP(end);
|
return PFN_UP(end);
|
||||||
disable:
|
disable:
|
||||||
|
|
Loading…
Reference in a new issue