Return-Path: Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=eajames@linux.vnet.ibm.com; receiver=) Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3ysT28466YzDqn6 for ; Thu, 7 Dec 2017 06:19:28 +1100 (AEDT) Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vB6JJG9c053115 for ; Wed, 6 Dec 2017 14:19:26 -0500 Received: from e18.ny.us.ibm.com (e18.ny.us.ibm.com [129.33.205.208]) by mx0b-001b2d01.pphosted.com with ESMTP id 2epne8baed-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 06 Dec 2017 14:19:26 -0500 Received: from localhost by e18.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 6 Dec 2017 14:19:24 -0500 Received: from b01cxnp22033.gho.pok.ibm.com (9.57.198.23) by e18.ny.us.ibm.com (146.89.104.205) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 6 Dec 2017 14:19:22 -0500 Received: from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com [9.57.199.108]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id vB6JJL2M39714984; Wed, 6 Dec 2017 19:19:21 GMT Received: from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E82CDB2050; Wed, 6 Dec 2017 14:16:28 -0500 (EST) Received: from oc3016140333.ibm.com (unknown [9.41.174.252]) by b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP id 8EA00B204D; Wed, 6 Dec 2017 14:16:28 -0500 (EST) From: Eddie James To: openbmc@lists.ozlabs.org Cc: joel@jms.id.au, mspinler@linux.vnet.ibm.com, "Edward A. James" Subject: [PATCH linux dev-4.10] hwmon (occ): Fix integer overflow in multiplication Date: Wed, 6 Dec 2017 13:19:19 -0600 X-Mailer: git-send-email 1.8.3.1 X-TM-AS-GCONF: 00 x-cbid: 17120619-0044-0000-0000-000003BAAB96 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008161; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000244; SDB=6.00956380; UDB=6.00483442; IPR=6.00736417; BA=6.00005729; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00018387; XFM=3.00000015; UTC=2017-12-06 19:19:23 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17120619-0045-0000-0000-000007E9E2F9 Message-Id: <1512587959-27264-1-git-send-email-eajames@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-12-06_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1712060274 X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Dec 2017 19:19:29 -0000 From: "Edward A. James" Power values were overflowing INT_MAX when being converted to microwatts, even though the storage was sufficiently large (unsigned 64 bit). Change literals to unsigned long long. Signed-off-by: Edward A. James --- drivers/hwmon/occ/common.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/hwmon/occ/common.c b/drivers/hwmon/occ/common.c index 3175e7b..a64f3db 100644 --- a/drivers/hwmon/occ/common.c +++ b/drivers/hwmon/occ/common.c @@ -468,7 +468,7 @@ static ssize_t occ_show_power_1(struct device *dev, struct device_attribute *attr, char *buf) { int rc; - u32 val = 0; + u64 val = 0; struct power_sensor_1 *power; struct occ *occ = dev_get_drvdata(dev); struct occ_sensors *sensors = &occ->sensors; @@ -491,11 +491,11 @@ static ssize_t occ_show_power_1(struct device *dev, val = get_unaligned_be32(&power->accumulator); break; case 3: - val = get_unaligned_be16(&power->value) * 1000000; + val = (u64)get_unaligned_be16(&power->value) * 1000000ULL; break; } - return snprintf(buf, PAGE_SIZE - 1, "%u\n", val); + return snprintf(buf, PAGE_SIZE - 1, "%llu\n", val); } static ssize_t occ_show_power_2(struct device *dev, @@ -525,7 +525,7 @@ static ssize_t occ_show_power_2(struct device *dev, val = get_unaligned_be64(&power->accumulator); break; case 3: - val = get_unaligned_be16(&power->value) * 1000000; + val = (u64)get_unaligned_be16(&power->value) * 1000000ULL; break; case 4: val = power->function_id; @@ -562,7 +562,8 @@ static ssize_t occ_show_power_a0(struct device *dev, val = get_unaligned_be16(&power->system.update_time); break; case 2: - val = get_unaligned_be16(&power->system.value) * 1000000; + val = (u64)get_unaligned_be16(&power->system.value) * + 1000000ULL; break; case 3: val = get_unaligned_be32(&power->system.update_tag); @@ -574,7 +575,7 @@ static ssize_t occ_show_power_a0(struct device *dev, val = get_unaligned_be16(&power->proc.update_time); break; case 6: - val = get_unaligned_be16(&power->proc.value) * 1000000; + val = (u64)get_unaligned_be16(&power->proc.value) * 1000000ULL; break; case 7: val = get_unaligned_be32(&power->proc.update_tag); @@ -583,7 +584,7 @@ static ssize_t occ_show_power_a0(struct device *dev, val = get_unaligned_be64(&power->proc.accumulator); break; case 9: - val = get_unaligned_be16(&power->vdd.value) * 1000000; + val = (u64)get_unaligned_be16(&power->vdd.value) * 1000000ULL; break; case 10: val = get_unaligned_be32(&power->vdd.update_tag); @@ -592,7 +593,7 @@ static ssize_t occ_show_power_a0(struct device *dev, val = get_unaligned_be64(&power->vdd.accumulator); break; case 12: - val = get_unaligned_be16(&power->vdn.value) * 1000000; + val = (u64)get_unaligned_be16(&power->vdn.value) * 1000000ULL; break; case 13: val = get_unaligned_be32(&power->vdn.update_tag); -- 1.8.3.1