From: Li Hua <hucool.lihua@huawei.com>
To: <wim@linux-watchdog.org>, <linux@roeck-us.net>
Cc: <linux-watchdog@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<weiyongjun1@huawei.com>, <yusongping@huawei.com>,
<hucool.lihua@huawei.com>
Subject: [PATCH] watchdog: pcwd_usb: Fix attempting to access uninitialized memory
Date: Tue, 15 Nov 2022 16:35:55 +0800 [thread overview]
Message-ID: <20221115083555.22928-1-hucool.lihua@huawei.com> (raw)
The stack variable msb and lsb may be used uninitialized in function
usb_pcwd_get_temperature and usb_pcwd_get_timeleft when usb card no response.
The build waring is:
drivers/watchdog/pcwd_usb.c:336:22: error: ‘lsb’ is used uninitialized in this function [-Werror=uninitialized]
*temperature = (lsb * 9 / 5) + 32;
~~~~^~~
drivers/watchdog/pcwd_usb.c:328:21: note: ‘lsb’ was declared here
unsigned char msb, lsb;
^~~
cc1: all warnings being treated as errors
scripts/Makefile.build:250: recipe for target 'drivers/watchdog/pcwd_usb.o' failed
make[3]: *** [drivers/watchdog/pcwd_usb.o] Error 1
Fixes: b7e04f8c61a4 ("mv watchdog tree under drivers")
Signed-off-by: Li Hua <hucool.lihua@huawei.com>
---
drivers/watchdog/pcwd_usb.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index 1bdaf17c1d38..89b0b5d8a7e6 100644
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -326,8 +326,13 @@ static int usb_pcwd_get_temperature(struct usb_pcwd_private *usb_pcwd,
int *temperature)
{
unsigned char msb, lsb;
+ int retval;
- usb_pcwd_send_command(usb_pcwd, CMD_READ_TEMP, &msb, &lsb);
+ retval = usb_pcwd_send_command(usb_pcwd, CMD_READ_TEMP, &msb, &lsb);
+ if (retval != 1) {
+ pr_err("Card did not acknowledge CMD_READ_TEMP\n");
+ return -1;
+ }
/*
* Convert celsius to fahrenheit, since this was
@@ -342,10 +347,16 @@ static int usb_pcwd_get_timeleft(struct usb_pcwd_private *usb_pcwd,
int *time_left)
{
unsigned char msb, lsb;
+ int retval;
/* Read the time that's left before rebooting */
/* Note: if the board is not yet armed then we will read 0xFFFF */
- usb_pcwd_send_command(usb_pcwd, CMD_READ_WATCHDOG_TIMEOUT, &msb, &lsb);
+ retval = usb_pcwd_send_command(usb_pcwd, CMD_READ_WATCHDOG_TIMEOUT,
+ &msb, &lsb);
+ if (retval != 1) {
+ pr_err("Card did not acknowledge CMD_READ_WATCHDOG_TIMEOUT\n");
+ return -1;
+ }
*time_left = (msb << 8) + lsb;
--
2.17.1
next reply other threads:[~2022-11-15 8:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-15 8:35 Li Hua [this message]
2022-11-15 13:42 ` Guenter Roeck
2022-11-16 2:07 ` [PATCH v2] " Li Hua
2022-11-16 13:52 ` Guenter Roeck
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=20221115083555.22928-1-hucool.lihua@huawei.com \
--to=hucool.lihua@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=weiyongjun1@huawei.com \
--cc=wim@linux-watchdog.org \
--cc=yusongping@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 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®