* [patch] hwmon: (max31790) potential ERR_PTR dereference
@ 2016-10-12 6:24 Dan Carpenter
2016-10-12 12:57 ` Guenter Roeck
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2016-10-12 6:24 UTC (permalink / raw)
To: Jean Delvare, Guenter Roeck; +Cc: linux-hwmon, kernel-janitors
We should only dereference "data" after we check if it is an error
pointer.
Fixes: 54187ff9d766 ('hwmon: (max31790) Convert to use new hwmon registration API')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/hwmon/max31790.c b/drivers/hwmon/max31790.c
index bef84e0..c1b9275 100644
--- a/drivers/hwmon/max31790.c
+++ b/drivers/hwmon/max31790.c
@@ -268,11 +268,13 @@ static int max31790_read_pwm(struct device *dev, u32 attr, int channel,
long *val)
{
struct max31790_data *data = max31790_update_device(dev);
- u8 fan_config = data->fan_config[channel];
+ u8 fan_config;
if (IS_ERR(data))
return PTR_ERR(data);
+ fan_config = data->fan_config[channel];
+
switch (attr) {
case hwmon_pwm_input:
*val = data->pwm[channel] >> 8;
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: hwmon: (max31790) potential ERR_PTR dereference
2016-10-12 6:24 [patch] hwmon: (max31790) potential ERR_PTR dereference Dan Carpenter
@ 2016-10-12 12:57 ` Guenter Roeck
0 siblings, 0 replies; 2+ messages in thread
From: Guenter Roeck @ 2016-10-12 12:57 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Jean Delvare, linux-hwmon, kernel-janitors
On Wed, Oct 12, 2016 at 09:24:52AM +0300, Dan Carpenter wrote:
> We should only dereference "data" after we check if it is an error
> pointer.
>
> Fixes: 54187ff9d766 ('hwmon: (max31790) Convert to use new hwmon registration API')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied.
Thanks,
Guenter
> ---
> To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
> diff --git a/drivers/hwmon/max31790.c b/drivers/hwmon/max31790.c
> index bef84e0..c1b9275 100644
> --- a/drivers/hwmon/max31790.c
> +++ b/drivers/hwmon/max31790.c
> @@ -268,11 +268,13 @@ static int max31790_read_pwm(struct device *dev, u32 attr, int channel,
> long *val)
> {
> struct max31790_data *data = max31790_update_device(dev);
> - u8 fan_config = data->fan_config[channel];
> + u8 fan_config;
>
> if (IS_ERR(data))
> return PTR_ERR(data);
>
> + fan_config = data->fan_config[channel];
> +
> switch (attr) {
> case hwmon_pwm_input:
> *val = data->pwm[channel] >> 8;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-12 12:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-12 6:24 [patch] hwmon: (max31790) potential ERR_PTR dereference Dan Carpenter
2016-10-12 12:57 ` Guenter Roeck
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).