[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1476698694-6685-1-git-send-email-matt.redfearn@imgtec.com>
Date: Mon, 17 Oct 2016 11:04:54 +0100
From: Matt Redfearn <matt.redfearn@...tec.com>
To: Ralf Baechle <ralf@...ux-mips.org>
CC: <linux-mips@...ux-mips.org>,
Matt Redfearn <matt.redfearn@...tec.com>,
"# 4 . 7+" <stable@...r.kernel.org>, <linux-kernel@...r.kernel.org>
Subject: [PATCH] MIPS: KASLR: Fix handling of NULL FDT
If platform code returns a NULL pointer to the FDT, initial_boot_params
will not get set to a valid pointer and attempting to find the /chosen
node in it will cause a NULL pointer dereference and the kernel to crash
immediately on startup - with no output to the console.
Fix this by checking that initial_boot_params is valid before using it.
Fixes: 405bc8fd12f5 ("MIPS: Kernel: Implement KASLR using CONFIG_RELOCATABLE")
Cc: <stable@...r.kernel.org> # 4.7+
Signed-off-by: Matt Redfearn <matt.redfearn@...tec.com>
---
arch/mips/kernel/relocate.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/mips/kernel/relocate.c b/arch/mips/kernel/relocate.c
index ca1cc30c0891..8810183840ca 100644
--- a/arch/mips/kernel/relocate.c
+++ b/arch/mips/kernel/relocate.c
@@ -200,6 +200,7 @@ static inline __init unsigned long get_random_boot(void)
#if defined(CONFIG_USE_OF)
/* Get any additional entropy passed in device tree */
+ if (initial_boot_params)
{
int node, len;
u64 *prop;
--
2.7.4
Powered by blists - more mailing lists