diff options
| author | James Hogan <james.hogan@imgtec.com> | 2013-11-21 13:44:14 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-12-11 13:40:30 +0000 |
| commit | 6f041e99fc7ba00e7e65a431527f9235d6b16463 (patch) | |
| tree | fdbea28599a09de74e3152480e8a425924530de5 /drivers/of/fdt.c | |
| parent | 374b105797c3d4f29c685f3be535c35f5689b30e (diff) | |
| download | op-kernel-dev-6f041e99fc7ba00e7e65a431527f9235d6b16463.zip op-kernel-dev-6f041e99fc7ba00e7e65a431527f9235d6b16463.tar.gz | |
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: James Hogan <james.hogan@imgtec.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'drivers/of/fdt.c')
| -rw-r--r-- | drivers/of/fdt.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 2fa024b..758b4f8 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -922,8 +922,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) { |
