From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753407AbbIPOKT (ORCPT ); Wed, 16 Sep 2015 10:10:19 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:36116 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752328AbbIPOKR (ORCPT ); Wed, 16 Sep 2015 10:10:17 -0400 Subject: Re: [PATCH] hwmon: max31790: fix dereference of ERR_PTR To: Sudip Mukherjee , Jean Delvare References: <1442412179-1547-1-git-send-email-sudipm.mukherjee@gmail.com> Cc: linux-kernel@vger.kernel.org, lm-sensors@lm-sensors.org From: Guenter Roeck Message-ID: <55F97823.2030307@roeck-us.net> Date: Wed, 16 Sep 2015 07:09:39 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <1442412179-1547-1-git-send-email-sudipm.mukherjee@gmail.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: linux@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/16/2015 07:02 AM, Sudip Mukherjee wrote: > max31790_update_device() return the error code in ERR_PTR. We were > checking if it has returned error or not but before checking we have > dereferenced it. > > Signed-off-by: Sudip Mukherjee Good catch. Applied. Thanks, Guenter > --- > drivers/hwmon/max31790.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/hwmon/max31790.c b/drivers/hwmon/max31790.c > index f129668..69c0ac8 100644 > --- a/drivers/hwmon/max31790.c > +++ b/drivers/hwmon/max31790.c > @@ -174,12 +174,12 @@ static ssize_t get_fan(struct device *dev, > { > struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); > struct max31790_data *data = max31790_update_device(dev); > - int sr = get_tach_period(data->fan_dynamics[attr->index]); > - int rpm; > + int sr, rpm; > > if (IS_ERR(data)) > return PTR_ERR(data); > > + sr = get_tach_period(data->fan_dynamics[attr->index]); > rpm = RPM_FROM_REG(data->tach[attr->index], sr); > > return sprintf(buf, "%d\n", rpm); > @@ -190,12 +190,12 @@ static ssize_t get_fan_target(struct device *dev, > { > struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); > struct max31790_data *data = max31790_update_device(dev); > - int sr = get_tach_period(data->fan_dynamics[attr->index]); > - int rpm; > + int sr, rpm; > > if (IS_ERR(data)) > return PTR_ERR(data); > > + sr = get_tach_period(data->fan_dynamics[attr->index]); > rpm = RPM_FROM_REG(data->target_count[attr->index], sr); > > return sprintf(buf, "%d\n", rpm); >