From: Christoph Niedermaier <cniedermaier@dh-electronics.com>
To: Marek Vasut <marek.vasut@mailbox.org>,
"u-boot@lists.denx.de" <u-boot@lists.denx.de>
Cc: Simon Glass <sjg@chromium.org>, Tom Rini <trini@konsulko.com>
Subject: RE: [PATCH 1/2] board: dhelectronics: Check pointer before access in dh_get_value_from_eeprom_buffer()
Date: Wed, 10 Sep 2025 13:18:13 +0000 [thread overview]
Message-ID: <31547fea5bd345e5b47d1e21a095f176@dh-electronics.com> (raw)
In-Reply-To: <20250907010103.667681-1-marek.vasut@mailbox.org>
From: Marek Vasut <marek.vasut@mailbox.org>
Sent: Sunday, September 7, 2025 3:01 AM
> The eip pointer in dh_get_value_from_eeprom_buffer() might be NULL.
> The current NULL pointer check happens too late, after the eip was
> accessed in variable assignment. Reorder the two, so the NULL pointer
> check happens first, and any access second, otherwise the access may
> trigger a hang or other undefined behavior.
>
> Signed-off-by: Marek Vasut <marek.vasut@mailbox.org>
> ---
> Cc: Christoph Niedermaier <cniedermaier@dh-electronics.com>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Tom Rini <trini@konsulko.com>
> ---
> board/dhelectronics/common/dh_common.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/board/dhelectronics/common/dh_common.c
> b/board/dhelectronics/common/dh_common.c
> index 9f8e5754d8c..aeabd617374 100644
> --- a/board/dhelectronics/common/dh_common.c
> +++ b/board/dhelectronics/common/dh_common.c
> @@ -131,14 +131,17 @@ int dh_read_eeprom_id_page(u8 *eeprom_buffer, const char *alias)
> int dh_get_value_from_eeprom_buffer(enum eip_request_values request, u8 *data, int
> data_len,
> struct eeprom_id_page *eip)
> {
> - const char fin_chr = (eip->pl.item_prefix & DH_ITEM_PREFIX_FIN_BIT) ?
> - DH_ITEM_PREFIX_FIN_FLASHED_CHR : DH_ITEM_PREFIX_FIN_HALF_CHR;
> - const u8 soc_coded = eip->pl.item_prefix & 0xf;
> + char fin_chr;
> + u8 soc_coded;
> char soc_chr;
>
> if (!eip)
> return -EINVAL;
>
> + fin_chr = (eip->pl.item_prefix & DH_ITEM_PREFIX_FIN_BIT) ?
> + DH_ITEM_PREFIX_FIN_FLASHED_CHR : DH_ITEM_PREFIX_FIN_HALF_CHR;
> + soc_coded = eip->pl.item_prefix & 0xf;
> +
> /* Copy requested data */
> switch (request) {
> case DH_MAC0:
Reviewed-by: Christoph Niedermaier <cniedermaier@dh-electronics.com>
next prev parent reply other threads:[~2025-09-10 13:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-07 1:00 [PATCH 1/2] board: dhelectronics: Check pointer before access in dh_get_value_from_eeprom_buffer() Marek Vasut
2025-09-07 1:00 ` [PATCH 2/2] board: dhelectronics: Use isascii() before isprint() in dh_read_eeprom_id_page() Marek Vasut
2025-09-10 13:20 ` Christoph Niedermaier
2025-09-10 13:18 ` Christoph Niedermaier [this message]
2025-09-17 13:47 ` [PATCH 1/2] board: dhelectronics: Check pointer before access in dh_get_value_from_eeprom_buffer() Tom Rini
2025-09-17 13:54 ` Marek Vasut
2025-09-17 15:07 ` Tom Rini
2025-09-17 15:08 ` Tom Rini
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=31547fea5bd345e5b47d1e21a095f176@dh-electronics.com \
--to=cniedermaier@dh-electronics.com \
--cc=marek.vasut@mailbox.org \
--cc=sjg@chromium.org \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox