diff options
| author | Rob Herring <robh@kernel.org> | 2013-12-30 19:09:47 +0100 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2013-12-30 19:09:47 +0100 |
| commit | f0082e3cf70e19dce4e96494078ec3ddb89550d3 (patch) | |
| tree | f569318df8b2e9cf0047b0398891f670f8053d44 /drivers | |
| parent | MAINTAINERS: Update Rob Herring's email address (diff) | |
| parent | of: Fix NULL dereference in unflatten_and_copy() (diff) | |
| download | linux-f0082e3cf70e19dce4e96494078ec3ddb89550d3.tar.xz linux-f0082e3cf70e19dce4e96494078ec3ddb89550d3.zip | |
Merge remote-tracking branch 'grant/devicetree/merge' into dt-fixes
Diffstat (limited to 'drivers')
| -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 2fa024b97c43..758b4f8b30b7 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) { |