From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC9DC1D174A; Wed, 2 Oct 2024 14:30:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727879442; cv=none; b=E9hY9dzbEf135l8H1Ph7myNuhh0nEpyc7O0NggxS9ULWqpNf4jsymKyp8l0OIGNcfi1t4fLsxvp1aBXBYHwMXrItsURPp3RWKoXOaMcrMHBM0yQuHkS29DAOvpL9aLQcKefNXQCY/PZIWcR682mMskC4DxZhsGkoUqdpzzjCV60= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727879442; c=relaxed/simple; bh=EiXTvfT4ZHuuHZ6TmloK0zOyMJzqKlqo7XglJVJdcuE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ru1a5RF+j4GgbOVfUbQ+kWEKmCTl0t6DYfg34p7lEOSyIwPn/20kt5I146NP3bwET52iqTf18NDC4E6m1EPol9r8X3ZdR3u1HBfORm7xsSD5BTPtcePBYAvQ/0FqxcegDB2gwxJA1rxGeKc5rZX5yIy4fVaVoLksZeeOA+H8LPc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ygB1Ddts; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ygB1Ddts" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B530C4CEC2; Wed, 2 Oct 2024 14:30:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727879442; bh=EiXTvfT4ZHuuHZ6TmloK0zOyMJzqKlqo7XglJVJdcuE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ygB1DdtsWIXWF9g6pJxkGFy1upl459ivdR4Rgyv7+wzFVAtS3f56swzCHVkIBbYGm zKCXq75H6GkXqY+IskiF9VH9LSHhery91znFnDoO1RotbQwXdrgNLrmnv95tTMeVjq +DDR2VE0XwzNUdsCSyxaPINo5VDcbTg7UX8rChOA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tzung-Bi Shih , Guenter Roeck , Sasha Levin Subject: [PATCH 6.6 120/538] hwmon: (max16065) Fix overflows seen when writing limits Date: Wed, 2 Oct 2024 14:55:59 +0200 Message-ID: <20241002125756.982937766@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125751.964700919@linuxfoundation.org> References: <20241002125751.964700919@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Guenter Roeck [ Upstream commit 744ec4477b11c42e2c8de9eb8364675ae7a0bd81 ] Writing large limits resulted in overflows as reported by module tests. in0_lcrit: Suspected overflow: [max=5538, read 0, written 2147483647] in0_crit: Suspected overflow: [max=5538, read 0, written 2147483647] in0_min: Suspected overflow: [max=5538, read 0, written 2147483647] Fix the problem by clamping prior to multiplications and the use of DIV_ROUND_CLOSEST, and by using consistent variable types. Reviewed-by: Tzung-Bi Shih Fixes: f5bae2642e3d ("hwmon: Driver for MAX16065 System Manager and compatibles") Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/hwmon/max16065.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/hwmon/max16065.c b/drivers/hwmon/max16065.c index aa38c45adc09e..e392529de098e 100644 --- a/drivers/hwmon/max16065.c +++ b/drivers/hwmon/max16065.c @@ -114,9 +114,10 @@ static inline int LIMIT_TO_MV(int limit, int range) return limit * range / 256; } -static inline int MV_TO_LIMIT(int mv, int range) +static inline int MV_TO_LIMIT(unsigned long mv, int range) { - return clamp_val(DIV_ROUND_CLOSEST(mv * 256, range), 0, 255); + mv = clamp_val(mv, 0, ULONG_MAX / 256); + return DIV_ROUND_CLOSEST(clamp_val(mv * 256, 0, range * 255), range); } static inline int ADC_TO_CURR(int adc, int gain) -- 2.43.0