From: Yuntao Wang <yuntao.wang@linux.dev>
To: Rob Herring <robh@kernel.org>, Saravana Kannan <saravanak@google.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>,
Catalin Marinas <catalin.marinas@arm.com>,
James Morse <james.morse@arm.com>, Baoquan He <bhe@redhat.com>,
Zhen Lei <thunder.leizhen@huawei.com>,
Ard Biesheuvel <ardb@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Geoff Levand <geoff@infradead.org>,
Andrew Morton <akpm@linux-foundation.org>,
Changyuan Lyu <changyuanl@google.com>,
Alexander Graf <graf@amazon.com>,
"Mike Rapoport (Microsoft)" <rppt@kernel.org>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Yuntao Wang <yuntao.wang@linux.dev>
Subject: [PATCH v3 2/8] of/fdt: Fix the len check in early_init_dt_check_for_elfcorehdr()
Date: Sat, 15 Nov 2025 21:47:47 +0800 [thread overview]
Message-ID: <20251115134753.179931-3-yuntao.wang@linux.dev> (raw)
In-Reply-To: <20251115134753.179931-1-yuntao.wang@linux.dev>
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.
Use a helper function to simplify the code and address this issue.
Fixes: f7e7ce93aac1 ("of: fdt: Add generic support for handling elf core headers property")
Fixes: e62aaeac426ab1dd ("arm64: kdump: provide /proc/vmcore file")
Signed-off-by: Yuntao Wang <yuntao.wang@linux.dev>
---
drivers/of/fdt.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 0c18bdefbbee..b45f60dccd7c 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -853,21 +853,15 @@ static void __init early_init_dt_check_for_initrd(unsigned long node)
*/
static void __init early_init_dt_check_for_elfcorehdr(unsigned long node)
{
- const __be32 *prop;
- int len;
-
if (!IS_ENABLED(CONFIG_CRASH_DUMP))
return;
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 (!of_flat_dt_get_addr_size(node, "linux,elfcorehdr",
+ &elfcorehdr_addr, &elfcorehdr_size))
return;
- elfcorehdr_addr = dt_mem_next_cell(dt_root_addr_cells, &prop);
- elfcorehdr_size = dt_mem_next_cell(dt_root_size_cells, &prop);
-
pr_debug("elfcorehdr_start=0x%llx elfcorehdr_size=0x%llx\n",
elfcorehdr_addr, elfcorehdr_size);
}
--
2.51.0
next prev parent reply other threads:[~2025-11-15 13:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-15 13:47 [PATCH v3 0/8] of/fdt: Some bug fixes and cleanups Yuntao Wang
2025-11-15 13:47 ` [PATCH v3 1/8] of/fdt: Consolidate duplicate code into helper functions Yuntao Wang
2025-11-17 7:01 ` Krzysztof Kozlowski
2025-11-17 11:56 ` Yuntao Wang
2025-11-17 12:34 ` Geert Uytterhoeven
2025-11-17 13:32 ` Yuntao Wang
2025-11-15 13:47 ` Yuntao Wang [this message]
2025-11-15 13:47 ` [PATCH v3 3/8] of/fdt: Fix the len check in early_init_dt_check_for_usable_mem_range() Yuntao Wang
2025-11-15 13:47 ` [PATCH v3 4/8] of/fdt: Fix incorrect use of dt_root_addr_cells in early_init_dt_check_kho() Yuntao Wang
2025-11-15 13:47 ` [PATCH v3 5/8] of/fdt: Simplify the logic of early_init_dt_scan_memory() Yuntao Wang
2025-11-15 13:47 ` [PATCH v3 6/8] of/reserved_mem: Simplify the logic of __reserved_mem_reserve_reg() Yuntao Wang
2025-11-15 13:47 ` [PATCH v3 7/8] of/reserved_mem: Simplify the logic of fdt_scan_reserved_mem_reg_nodes() Yuntao Wang
2025-11-15 13:47 ` [PATCH v3 8/8] of/reserved_mem: Simplify the logic of __reserved_mem_alloc_size() Yuntao Wang
2025-11-20 14:32 ` [PATCH v3 0/8] of/fdt: Some bug fixes and cleanups Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251115134753.179931-3-yuntao.wang@linux.dev \
--to=yuntao.wang@linux.dev \
--cc=akpm@linux-foundation.org \
--cc=ardb@kernel.org \
--cc=bhe@redhat.com \
--cc=catalin.marinas@arm.com \
--cc=changyuanl@google.com \
--cc=devicetree@vger.kernel.org \
--cc=geert+renesas@glider.be \
--cc=geoff@infradead.org \
--cc=graf@amazon.com \
--cc=james.morse@arm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh@kernel.org \
--cc=rppt@kernel.org \
--cc=saravanak@google.com \
--cc=thunder.leizhen@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.