From: Guenter Roeck <linux@roeck-us.net>
To: Kangjie Lu <kjlu@umn.edu>
Cc: pakki001@umn.edu, Jean Delvare <jdelvare@suse.com>,
linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] hwmon: (lm80) fix a missing check of the status of SMBus read
Date: Fri, 21 Dec 2018 15:32:14 -0800 [thread overview]
Message-ID: <20181221233214.GA10894@roeck-us.net> (raw)
In-Reply-To: <20181221190134.930-1-kjlu@umn.edu>
On Fri, Dec 21, 2018 at 01:01:33PM -0600, Kangjie Lu wrote:
> If lm80_read_value() fails, it returns a negative number instead of the
> correct read data. Therefore, we should avoid using the data if it
> fails.
>
> The fix checks if lm80_read_value() fails, and if so, returns with the
> error number.
>
> Signed-off-by: Kangjie Lu <kjlu@umn.edu>
> ---
[ change log goes here ]
> drivers/hwmon/lm80.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
> index 08e3945a6fbf..d91333557f04 100644
> --- a/drivers/hwmon/lm80.c
> +++ b/drivers/hwmon/lm80.c
> @@ -360,6 +360,7 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
> struct i2c_client *client = data->client;
> unsigned long min, val;
> u8 reg;
> + int rv;
> int err = kstrtoul(buf, 10, &val);
> if (err < 0)
> return err;
Now we have 'rv' and 'err'.
My earlier comments didn't mean to suggest that we should now have two
different variables to handle errors.
Never mind, I'll fix it all up myself. No need to resend.
Guenter
> @@ -390,8 +391,11 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr,
> return -EINVAL;
> }
>
> - reg = (lm80_read_value(client, LM80_REG_FANDIV) &
> - ~(3 << (2 * (nr + 1)))) | (data->fan_div[nr] << (2 * (nr + 1)));
> + rv = lm80_read_value(client, LM80_REG_FANDIV);
> + if (rv < 0)
> + return rv;
> + reg = (rv & ~(3 << (2 * (nr + 1))))
> + | (data->fan_div[nr] << (2 * (nr + 1)));
> lm80_write_value(client, LM80_REG_FANDIV, reg);
>
> /* Restore fan_min */
prev parent reply other threads:[~2018-12-21 23:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-21 19:01 [PATCH v2] hwmon: (lm80) fix a missing check of the status of SMBus read Kangjie Lu
2018-12-21 23:32 ` Guenter Roeck [this message]
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=20181221233214.GA10894@roeck-us.net \
--to=linux@roeck-us.net \
--cc=jdelvare@suse.com \
--cc=kjlu@umn.edu \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pakki001@umn.edu \
/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;
as well as URLs for NNTP newsgroup(s).