mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-04 09:59:32 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
This commit is contained in:
Bjorn Helgaas 2014-10-29 12:15:00 -06:00 committed by Grant Likely
parent b75b276bea
commit 50ba08f301
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/of/fdt.c
View file

@ -992,15 +992,12 @@ bool __init early_init_dt_verify(void *params)
if (!params)
return false;
/* check device tree validity */
if (fdt_check_header(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;
return false;
}
return true;
}