lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 252/352] hwmon: (lm80) fix a missing check of bus read in lm80 probe
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 9aa3aa15f4c2f74f47afd6c5db4b420fadf3f315 ]

    In lm80_probe(), if lm80_read_value() fails, it returns a negative
    error number which is stored to data->fan[f_min] and will be further
    used. We should avoid using the data if the read 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>
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/hwmon/lm80.c | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c
    index 04f9df0d2341..0e30fa00204c 100644
    --- a/drivers/hwmon/lm80.c
    +++ b/drivers/hwmon/lm80.c
    @@ -628,6 +628,7 @@ static int lm80_probe(struct i2c_client *client,
    struct device *dev = &client->dev;
    struct device *hwmon_dev;
    struct lm80_data *data;
    + int rv;

    data = devm_kzalloc(dev, sizeof(struct lm80_data), GFP_KERNEL);
    if (!data)
    @@ -640,8 +641,14 @@ static int lm80_probe(struct i2c_client *client,
    lm80_init_client(client);

    /* A few vars need to be filled upon startup */
    - data->fan[f_min][0] = lm80_read_value(client, LM80_REG_FAN_MIN(1));
    - data->fan[f_min][1] = lm80_read_value(client, LM80_REG_FAN_MIN(2));
    + rv = lm80_read_value(client, LM80_REG_FAN_MIN(1));
    + if (rv < 0)
    + return rv;
    + data->fan[f_min][0] = rv;
    + rv = lm80_read_value(client, LM80_REG_FAN_MIN(2));
    + if (rv < 0)
    + return rv;
    + data->fan[f_min][1] = rv;

    hwmon_dev = devm_hwmon_device_register_with_groups(dev, client->name,
    data, lm80_groups);
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-02-11 15:33    [W:4.028 / U:0.348 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site