From patchwork Mon Dec 5 04:55:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 9460331 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4B17C6022E for ; Mon, 5 Dec 2016 06:04:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 423CF24B5B for ; Mon, 5 Dec 2016 06:04:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 371792621D; Mon, 5 Dec 2016 06:04:17 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 D6DE224B5B for ; Mon, 5 Dec 2016 06:04:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751400AbcLEGEQ (ORCPT ); Mon, 5 Dec 2016 01:04:16 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:51324 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751039AbcLEGEQ (ORCPT ); Mon, 5 Dec 2016 01:04:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=roeck-us.net; s=default; h=References:In-Reply-To:Message-Id:Date:Subject: Cc:To:From; bh=rqiEunnReFNycOHaDa3SkiY/7FVFC2lZ4vn53v+hyQg=; b=ppX7mi0exSVJVm 3XUFYW31p1rDEoZQx+X28EVaxkHyS1WPW5avwfzezlCkq9iItv02Z3yYeXHjy4qDYaAzv5IsLxDQa rGWn8QDhCpcQVhIc19qMV8vI6nQB2VY2qb6xykpbOvJKrWyknwuIoI98NdppPIcae13Iw+xMKbWv1 bQJ+IHWl2bZArf/ZX00qltdJROEtlIvfhQkPU6bQaUeo6Y+LiEhz1idqqUlZvv+2upkyZuSIhjmmg In21Sxf1UpL3zHJnEYJICRM7MYNGFOEgPoX1p/v+osU1BHB8Tf2TU+qiJUum/P+HUjpcrOO0UYvdT aRwcaLCa662TnfwO9fVQ==; Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:49764 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.86_1) (envelope-from ) id 1cDlJd-0009A3-9f; Mon, 05 Dec 2016 04:55:49 +0000 From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 07/17] hwmon: (adt7462) Fix overflows seen when writing into limit attributes Date: Sun, 4 Dec 2016 20:55:30 -0800 Message-Id: <1480913740-5678-7-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1480913740-5678-1-git-send-email-linux@roeck-us.net> References: <1480913740-5678-1-git-send-email-linux@roeck-us.net> X-Authenticated_sender: guenter@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: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: 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 Fix overflows seen when writing large values into temperature limit, voltage limit, and pwm hysteresis attributes. The input parameter to DIV_ROUND_CLOSEST() needs to be clamped to avoid such overflows. Signed-off-by: Guenter Roeck --- drivers/hwmon/adt7462.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/hwmon/adt7462.c b/drivers/hwmon/adt7462.c index 5929e126da63..0e9c8d3e8f5c 100644 --- a/drivers/hwmon/adt7462.c +++ b/drivers/hwmon/adt7462.c @@ -810,8 +810,7 @@ static ssize_t set_temp_min(struct device *dev, if (kstrtol(buf, 10, &temp) || !temp_enabled(data, attr->index)) return -EINVAL; - temp = DIV_ROUND_CLOSEST(temp, 1000) + 64; - temp = clamp_val(temp, 0, 255); + temp = DIV_ROUND_CLOSEST(clamp_val(temp, -64000, 191000), 1000) + 64; mutex_lock(&data->lock); data->temp_min[attr->index] = temp; @@ -848,8 +847,7 @@ static ssize_t set_temp_max(struct device *dev, if (kstrtol(buf, 10, &temp) || !temp_enabled(data, attr->index)) return -EINVAL; - temp = DIV_ROUND_CLOSEST(temp, 1000) + 64; - temp = clamp_val(temp, 0, 255); + temp = DIV_ROUND_CLOSEST(clamp_val(temp, -64000, 191000), 1000) + 64; mutex_lock(&data->lock); data->temp_max[attr->index] = temp; @@ -912,6 +910,7 @@ static ssize_t set_volt_max(struct device *dev, if (kstrtol(buf, 10, &temp) || !x) return -EINVAL; + temp = clamp_val(temp, 0, INT_MAX / 1000 - x); temp *= 1000; /* convert mV to uV */ temp = DIV_ROUND_CLOSEST(temp, x); temp = clamp_val(temp, 0, 255); @@ -954,6 +953,7 @@ static ssize_t set_volt_min(struct device *dev, if (kstrtol(buf, 10, &temp) || !x) return -EINVAL; + temp = clamp_val(temp, 0, INT_MAX / 1000 - x); temp *= 1000; /* convert mV to uV */ temp = DIV_ROUND_CLOSEST(temp, x); temp = clamp_val(temp, 0, 255); @@ -1220,8 +1220,7 @@ static ssize_t set_pwm_hyst(struct device *dev, if (kstrtol(buf, 10, &temp)) return -EINVAL; - temp = DIV_ROUND_CLOSEST(temp, 1000); - temp = clamp_val(temp, 0, 15); + temp = DIV_ROUND_CLOSEST(clamp_val(temp, 0, 15000), 1000); /* package things up */ temp &= ADT7462_PWM_HYST_MASK; @@ -1306,8 +1305,7 @@ static ssize_t set_pwm_tmin(struct device *dev, if (kstrtol(buf, 10, &temp)) return -EINVAL; - temp = DIV_ROUND_CLOSEST(temp, 1000) + 64; - temp = clamp_val(temp, 0, 255); + temp = DIV_ROUND_CLOSEST(clamp_val(temp, -64000, 191000), 1000) + 64; mutex_lock(&data->lock); data->pwm_tmin[attr->index] = temp;