From: Guenter Roeck <linux@roeck-us.net>
To: Dan Carpenter <dan.carpenter@linaro.org>,
Enric Balletbo i Serra <eballetbo@kernel.org>
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/3] watchdog: ziirave_wdt: check record length in ziirave_firm_verify()
Date: Mon, 2 Jun 2025 07:11:34 -0700 [thread overview]
Message-ID: <e7c1cf7e-b007-49cb-9441-31ecdce3614c@roeck-us.net> (raw)
In-Reply-To: <3b58b453f0faa8b968c90523f52c11908b56c346.1748463049.git.dan.carpenter@linaro.org>
On 5/28/25 13:22, Dan Carpenter wrote:
> The "rec->len" value comes from the firmware. We generally do
> trust firmware, but it's always better to double check. If
> the length value is too large it would lead to memory corruption
> when we set "data[i] = ret;"
>
> Fixes: 217209db0204 ("watchdog: ziirave_wdt: Add support to upload the firmware.")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Guenetr Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/ziirave_wdt.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/watchdog/ziirave_wdt.c b/drivers/watchdog/ziirave_wdt.c
> index fcc1ba02e75b..5c6e3fa001d8 100644
> --- a/drivers/watchdog/ziirave_wdt.c
> +++ b/drivers/watchdog/ziirave_wdt.c
> @@ -302,6 +302,9 @@ static int ziirave_firm_verify(struct watchdog_device *wdd,
> const u16 len = be16_to_cpu(rec->len);
> const u32 addr = be32_to_cpu(rec->addr);
>
> + if (len > sizeof(data))
> + return -EINVAL;
> +
> if (ziirave_firm_addr_readonly(addr))
> continue;
>
next prev parent reply other threads:[~2025-06-02 14:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-28 20:22 [PATCH 0/3] ihex: add some bounds checking to firmware parsing Dan Carpenter
2025-05-28 20:22 ` [PATCH 1/3] media: gspca: Add bounds checking to firmware parser Dan Carpenter
2025-05-28 20:22 ` [PATCH 2/3] watchdog: ziirave_wdt: check record length in ziirave_firm_verify() Dan Carpenter
2025-06-02 14:11 ` Guenter Roeck [this message]
2025-05-28 20:22 ` [PATCH 3/3] Input: ims-pcu - Check record size in ims_pcu_flash_firmware() Dan Carpenter
2025-05-28 23:26 ` Kees Cook
2025-06-02 11:00 ` Dan Carpenter
2025-05-30 23:14 ` Dmitry Torokhov
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=e7c1cf7e-b007-49cb-9441-31ecdce3614c@roeck-us.net \
--to=linux@roeck-us.net \
--cc=dan.carpenter@linaro.org \
--cc=eballetbo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=wim@linux-watchdog.org \
/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
all inboxes | Powered by JetHome®