From patchwork Fri Dec 21 19:10:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 10740891 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E758B6C5 for ; Fri, 21 Dec 2018 19:10:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3B042875F for ; Fri, 21 Dec 2018 19:10:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C7C5E28765; Fri, 21 Dec 2018 19:10:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D33692875F for ; Fri, 21 Dec 2018 19:10:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388931AbeLUTKs (ORCPT ); Fri, 21 Dec 2018 14:10:48 -0500 Received: from mta-p7.oit.umn.edu ([134.84.196.207]:60156 "EHLO mta-p7.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387647AbeLUTKs (ORCPT ); Fri, 21 Dec 2018 14:10:48 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id BA1CDD1F for ; Fri, 21 Dec 2018 19:10:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p7.oit.umn.edu ([127.0.0.1]) by localhost (mta-p7.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kKYas7jvlJyi for ; Fri, 21 Dec 2018 13:10:46 -0600 (CST) Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p7.oit.umn.edu (Postfix) with ESMTPS id 874CDC26 for ; Fri, 21 Dec 2018 13:10:46 -0600 (CST) Received: by mail-io1-f70.google.com with SMTP id w5so5476450iom.3 for ; Fri, 21 Dec 2018 11:10:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=yy2/4a+ag6m7ATAsbo+6+iGfjYwWjT+Z5BCSnIA0FJE=; b=SphlE1viJQPCKS9vzHNT97u3mU0UUw+7JFpMYHTQypzwYPfgRCpw8DfORPcloev60C T16WNTrqqkXMwo6cMYVcqQNs5LAzuSxia3l1E/2N7satIkmJGJrXxic5gAfHer1pkr2d TMwvWexqxxPTwlEJJaqlJA0MepTzRLgrj7RHeSK3kwVETvGkSia6BHKkphdfV+1qLGgP B1YHO31WRBipgt+Uiv9Yxc9pC0XPa5LXzN8pAXdB3hXQ5k7YuaoDTM7feWk5DcDOJihw Rb4fJhlmP458vDFLK2WLz9eIZ30EFSpdlq5vcB3NGB/kZ+yppDOT1/r4/hiJSrJhsFMP Xj1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=yy2/4a+ag6m7ATAsbo+6+iGfjYwWjT+Z5BCSnIA0FJE=; b=uH0tulafa6MaGVsHdA01fMPXEuOhL1ceQYksF06g+IYHvoL9RLawkXdJEf1TwO77sM fRGd1N0wEFjo2b+8Ei1Xnhmb9Brd8kO3K6grJkPXEpgTqgL2QIpgO4AliLclM0hViSDe 419kxal70wanXNn10MvwDDOyTv7jJVfxBF84GoQMi87n6khWBGXhOEoqhAWzrQOqOQ3Z pzPJIQ1Lq/S08VM02DobuoYw5TNVDT25AfROv24teonlPyi0VgJcL4yaJOQSoxzLpM9V oFCwAA6fHuDuBt9mOGxTI/Yk6iMN1S+S64X9DADWmDyoO9lJQw9V23zp97/OGOFBXjPH 5wHw== X-Gm-Message-State: AA+aEWaFg+AwNglhFwrK0WXDS3mmu4o17IBIG5giMGqrKcQTTB/YpUXo cx3nhNJroj147iRT/ngXUJE5/mkeBTOs9KUhYLpr0xpCw7/RasPsQgz0V9YSzpTUyIFo0D9kx1I svidCRuWetOIKmgwXs4YrsiM9vr0= X-Received: by 2002:a02:1885:: with SMTP id 5mr2543481jar.110.1545419445392; Fri, 21 Dec 2018 11:10:45 -0800 (PST) X-Google-Smtp-Source: AFSGD/U6b9FsC3mfRmMpH52tiHgYujKHtFvPkHksUlnEn9vcbrn1r8tvQZ7UV8B8gezUQHYkhcXZEw== X-Received: by 2002:a02:1885:: with SMTP id 5mr2543469jar.110.1545419445145; Fri, 21 Dec 2018 11:10:45 -0800 (PST) Received: from bee.cs.umn.edu (cs-bee0u.cs.umn.edu. [134.84.121.28]) by smtp.gmail.com with ESMTPSA id h8sm585454ioj.9.2018.12.21.11.10.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Dec 2018 11:10:44 -0800 (PST) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, Jean Delvare , Guenter Roeck , linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] hwmon: (lm80) fix a missing check of bus read in lm80 probe Date: Fri, 21 Dec 2018 13:10:39 -0600 Message-Id: <20181221191039.1519-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 d91333557f04..85f797501aaf 100644 --- a/drivers/hwmon/lm80.c +++ b/drivers/hwmon/lm80.c @@ -627,6 +627,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) @@ -639,8 +640,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);