Commit 50ba08f3 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Grant Likely

of/fdt: Don't clear initial_boot_params if fdt_check_header() fails

If the device tree pointer is NULL, early_init_dt_verify() fails, leaving
initial_boot_params unchanged.  If the device tree pointer is non-NULL but
invalid, early_init_dt_verify() again fails but this time it also clears
initial_boot_params.

Leave initial_boot_params unchanged if the device tree pointer is invalid.
This doesn't fix a bug, but it makes the behavior more consistent and
easier to analyze.
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
parent b75b276b
......@@ -992,15 +992,12 @@ bool __init early_init_dt_verify(void *params)
if (!params)
return false;
/* Setup flat device-tree pointer */
initial_boot_params = params;
/* check device tree validity */
if (fdt_check_header(params)) {
initial_boot_params = NULL;
if (fdt_check_header(params))
return false;
}
/* Setup flat device-tree pointer */
initial_boot_params = params;
return true;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment