[PATCH v3 2/3] LoongArch: Skip relocation-time KASLR if it has already been applied
WANG Rui <[email protected]>
| Newsgroups | org.kernel.vger.linux-efi,dev.linux.lists.loongarch,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
When the kernel is relocated during early boot, a randomized load address may already have been selected and applied. In this case, performing KASLR again in relocate.c is unnecessary. Signed-off-by: WANG Rui <[email protected]> --- arch/loongarch/kernel/relocate.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/loongarch/kernel/relocate.c b/arch/loongarch/kernel/relocate.c index 16f6a9b39659..c36604a81d08 100644 --- a/arch/loongarch/kernel/relocate.c +++ b/arch/loongarch/kernel/relocate.c @@ -139,6 +139,10 @@ static inline __init bool kaslr_disabled(void) char *str; const char *builtin_cmdline = CONFIG_CMDLINE; + /* KASLR is performed during early boot. */ + if (kaslr_offset()) + return true; + str = strstr(builtin_cmdline, "nokaslr"); if (str == builtin_cmdline || (str > builtin_cmdline && *(str - 1) == ' ')) { pr_info(KASLR_DISABLED_MESSAGE, "\'nokaslr\'", "built-in"); -- 2.54.0