Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1115e233 authored by James Hogan's avatar James Hogan Committed by Joonwoo Park
Browse files

of: Fix NULL dereference in unflatten_and_copy() 



Check whether initial_boot_params is NULL before dereferencing it in
unflatten_and_copy_device_tree() for the case where no device tree is
available but the arch can still boot to a minimal usable system without
it. In this case also log a warning for when the kernel log buffer is
obtainable.

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Git-commit: 6f041e99fc7ba00e7e65a431527f9235d6b16463
Signed-off-by: default avatarJoonwoo Park <joonwoop@codeaurora.org>
parent 73712fe3

drivers/of/fdt.c

+10 −2
Original line number Diff line number Diff line
@@ -915,8 +915,16 @@ void __init unflatten_device_tree(void) 
 */

void __init unflatten_and_copy_device_tree(void)

{

	int size = __be32_to_cpu(initial_boot_params->totalsize);

	void *dt = early_init_dt_alloc_memory_arch(size,

	int size;

	void *dt;



	if (!initial_boot_params) {

		pr_warn("No valid device tree found, continuing without\n");

		return;

	}



	size = __be32_to_cpu(initial_boot_params->totalsize);

	dt = early_init_dt_alloc_memory_arch(size,

		__alignof__(struct boot_param_header));



	if (dt) {