@@ -812,6 +812,7 @@ static void __init early_init_dt_check_for_initrd(unsigned long node)
*/
static void __init early_init_dt_check_for_elfcorehdr(unsigned long node)
{
+ int t_len = (dt_root_addr_cells + dt_root_size_cells) * sizeof(__be32);
const __be32 *prop;
int len;
@@ -821,7 +822,7 @@ static void __init early_init_dt_check_for_elfcorehdr(unsigned long node)
pr_debug("Looking for elfcorehdr property... ");
prop = of_get_flat_dt_prop(node, "linux,elfcorehdr", &len);
- if (!prop || (len < (dt_root_addr_cells + dt_root_size_cells)))
+ if (!prop || len < t_len)
return;
elfcorehdr_addr = dt_mem_next_cell(dt_root_addr_cells, &prop);
The len value is in bytes, while `dt_root_addr_cells + dt_root_size_cells` is in cells (4 bytes per cell). Comparing them directly is incorrect. Convert units before comparison. Fixes: f7e7ce93aac1 ("of: fdt: Add generic support for handling elf core headers property") Signed-off-by: Yuntao Wang <yuntao.wang@linux.dev> --- drivers/of/fdt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)