[PATCH] MIPS: KASLR: Fix handling of NULL FDT

From	Matt Redfearn <matt.redfearn@imgtec.com>
Newsgroups	linux.kernel
Subject	[PATCH] MIPS: KASLR: Fix handling of NULL FDT
Date	2016-10-17 12:10 +0200
Message-ID	<std1L-26b-11@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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@vger.kernel.org> # 4.7+
Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] MIPS: KASLR: Fix handling of NULL FDT Matt Redfearn <matt.redfearn@imgtec.com> - 2016-10-17 12:10 +0200
  Re: [PATCH] MIPS: KASLR: Fix handling of NULL FDT James Hogan <james.hogan@imgtec.com> - 2016-10-17 12:20 +0200
  Re: [PATCH] MIPS: KASLR: Fix handling of NULL FDT Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-10-17 15:50 +0200

csiph-web