From patchwork Thu Mar 1 15:22:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130240 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2933753edc; Thu, 1 Mar 2018 07:24:11 -0800 (PST) X-Google-Smtp-Source: AG47ELu3ZeKCm3rB6y0EsrrBh/G5NrNIfdhc8DpuQsBY3qsrNcot2cftvABQznOlgoeRXfjnyVAt X-Received: by 2002:a17:902:8214:: with SMTP id x20-v6mr2242884pln.182.1519917851311; Thu, 01 Mar 2018 07:24:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519917851; cv=none; d=google.com; s=arc-20160816; b=WMEzj8I/XwREgfkxMpQFzYTDFNjWmANBKAvtjMHmPcW6/0IzuO8RG2zRRBXBuihAT0 ghPPji16UbLv5Ma4kEyekojcjaGE0NCzYMcs3EI5VYio4FkCo0wzU+XQfffdkZfIfVGn SMZskJP/XbO5KPbIMKWgh6u1A8tNi6RIBkggbrRHiJb/Ka6wmjRftgJVx5J+zPSo5zrg WGeTz19zj5gckSAj/BEdCxkyL5eBLOxyDJmNhidnIG9ji0hwNU8k+BG16h9GM3LIX4Uk 4XB27NRIe6oTKnKMGR7bPbszSWaVYppqgZA6jWWFmkjFer77bpxroD6Ezc0VgainWcNf kYxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=kkjc1V+ZJkIyhQMgbXwIGFdV7ZwuP7MSNGGCrh16Fas=; b=lgJUVV9OGU0JPcG/JUvXHmSEdwKUPJGFyIKzN3BhTmNCfIdyaz9H7z4Wnx9rrpLTPm 0/dyfVXA9efhEbbDyft1oKG5WRmC9J8jx3WR0vGf1PqCmRfdmNugztC6CxCoB5Tg4Gee ETjfA9ar6l8hwsZGnQ9cDRV1fSrMKbtJWpRRXQfO3ptpQxwujyLR6lSq0u/j99CWdUJJ ugBpOMv7nBnzwTHCePNGKyr3zfHaNEGzpkIA//0MEY49MJeWc7VPO+XTq9yA1i+snRhn IxTWCupbtbVajrxnIiKvK/hnlR/qdBfel+12tarvFJWAdCOphdV/CaqeCx2yxkZDaQOc +mng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=c0BoK05L; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b72si3177910pfk.10.2018.03.01.07.24.10; Thu, 01 Mar 2018 07:24:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=c0BoK05L; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031892AbeCAPYI (ORCPT + 10 others); Thu, 1 Mar 2018 10:24:08 -0500 Received: from mail-by2nam03on0136.outbound.protection.outlook.com ([104.47.42.136]:8982 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1031898AbeCAPXh (ORCPT ); Thu, 1 Mar 2018 10:23:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=kkjc1V+ZJkIyhQMgbXwIGFdV7ZwuP7MSNGGCrh16Fas=; b=c0BoK05LfslZWij3sPo8KhTd/QVD6s81DASUrUYxEXtKs2Ip6+TErOn9F4N+n3r6ewGELXocCX2Jx2GNnTytHAkpJCLtBRlI3ywzvdujiLmTOQJTIaH7uESpcOWYQ8Om9gbzFI5k1C792Ykr4JJcYglagD9qD08AdBlQyfg1NwI= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1095.namprd21.prod.outlook.com (52.132.130.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:23:35 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:23:35 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Guenter Roeck , Sasha Levin Subject: [added to the 4.1 stable tree] hwmon: (asus_atk0110) fix uninitialized data access Thread-Topic: [added to the 4.1 stable tree] hwmon: (asus_atk0110) fix uninitialized data access Thread-Index: AQHTsXEmPvX/3Viff0m2ayLgni2TWg== Date: Thu, 1 Mar 2018 15:22:45 +0000 Message-ID: <20180301152116.1486-30-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1095; 7:U+9zGN6ExVoJk3+iwn/EjCJv3fLihXRcRqpFWjWyYQQZoxQsrv8Wf65XPGLYGx4xxIhrKxC5nbd/CjlQHBATbaS769CvmxI1mvixQABGfHWgbRzZDMJfgiQt/bMo+cnQBp9aWD8Q0k4iHUyABv15NnXKUjgjWL5syELjZp1Cw9IFof54UPZbmSMhGdFLihk823sX0bgyVoSljAvwxGpcyHiS8Jfztm77SNCXKz2ZxuJtvzHxXLoMlP0zh3kmM8ak x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 3c48d89d-9553-466c-977e-08d57f886693 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1095; x-ms-traffictypediagnostic: DM5PR2101MB1095: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231220)(944501224)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1095; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1095; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(346002)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(26005)(3846002)(6116002)(1076002)(72206003)(110136005)(54906003)(25786009)(106356001)(5660300001)(316002)(36756003)(3280700002)(10290500003)(186003)(7736002)(478600001)(10090500001)(6346003)(2900100001)(2906002)(102836004)(86612001)(86362001)(99286004)(2950100002)(97736004)(6512007)(53936002)(6506007)(14454004)(66066001)(305945005)(22452003)(81156014)(81166006)(3660700001)(107886003)(6486002)(59450400001)(6436002)(76176011)(5250100002)(4326008)(68736007)(8676002)(8936002)(2501003)(6666003)(105586002)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1095; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: KLe8//yR280Da8+mwqkNtXktHYNL6ibAnpXsWtb/ick9M4wVk/bHXzh/4UNiM/wdy41JZfSPU5X5OZLrj5s8dKkSejFJXsfDYqmAtHgauEk02hksSaVxA6aWQKLZFbYr9FNKKGCOqMF/Xw1YbNkaf1x8BGCVw5Gguc8X+JwZFpI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c48d89d-9553-466c-977e-08d57f886693 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:22:45.5576 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1095 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit a2125d02443e9a4e68bcfd9f8004fa23239e8329 ] The latest gcc-7 snapshot adds a warning to point out that when atk_read_value_old or atk_read_value_new fails, we copy uninitialized data into sensor->cached_value: drivers/hwmon/asus_atk0110.c: In function 'atk_input_show': drivers/hwmon/asus_atk0110.c:651:26: error: 'value' may be used uninitialized in this function [-Werror=maybe-uninitialized] Adding an error check avoids this. All versions of the driver are affected. Fixes: 2c03d07ad54d ("hwmon: Add Asus ATK0110 support") Signed-off-by: Arnd Bergmann Reviewed-by: Luca Tettamanti Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/hwmon/asus_atk0110.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c index cccef87963e0..975c43d446f8 100644 --- a/drivers/hwmon/asus_atk0110.c +++ b/drivers/hwmon/asus_atk0110.c @@ -646,6 +646,9 @@ static int atk_read_value(struct atk_sensor_data *sensor, u64 *value) else err = atk_read_value_new(sensor, value); + if (err) + return err; + sensor->is_valid = true; sensor->last_updated = jiffies; sensor->cached_value = *value;