Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Feedback-ID: i0ad843c9:Fastmail
Message-ID: <6b23af14-340d-b7b5-7d20-14fae03f724c@sholland.org>
Date:   Fri, 28 Oct 2022 18:06:07 -0500
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux ppc64le; rv:102.0) Gecko/20100101
 Thunderbird/102.3.3
Subject: Re: [PATCH] power: supply: ip5xxx: Fix integer overflow in
 current_now calculation
Content-Language: en-US
To:     Ondrej Jirman <megi@xff.cz>, Sebastian Reichel <sre@kernel.org>
Cc:     "open list:POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS" 
        <linux-pm@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>,
        linux-rockchip@lists.infradead.org
References: <20221028224052.293693-1-megi@xff.cz>
From:   Samuel Holland <samuel@sholland.org>
In-Reply-To: <20221028224052.293693-1-megi@xff.cz>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 10/28/22 17:40, Ondrej Jirman wrote:
> When current is larger than ~2A, the multiplication in current_now
> property overflows and the kernel reports invalid negative current
> value. Change the numerator and denominator while preserving their
> ratio to allow up to +-6A before the overflow.
> 
> Fixes: 75853406fa27 ("power: supply: Add a driver for Injoinic power bank ICs")
> Signed-off-by: Ondrej Jirman <megi@xff.cz>

Reviewed-by: Samuel Holland <samuel@sholland.org>

> ---
>  drivers/power/supply/ip5xxx_power.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/power/supply/ip5xxx_power.c b/drivers/power/supply/ip5xxx_power.c
> index 02ee4d252a3e..f39cb2f7aa11 100644
> --- a/drivers/power/supply/ip5xxx_power.c
> +++ b/drivers/power/supply/ip5xxx_power.c
> @@ -398,7 +398,7 @@ static int ip5xxx_battery_get_property(struct power_supply *psy,
>  		ret = ip5xxx_battery_read_adc(ip5xxx, IP5XXX_BATIADC_DAT0,
>  					      IP5XXX_BATIADC_DAT1, &raw);
>  
> -		val->intval = DIV_ROUND_CLOSEST(raw * 745985, 1000);
> +		val->intval = DIV_ROUND_CLOSEST(raw * 261095, 350);

DIV_ROUND_CLOSEST(raw * 149197, 200) would be marginally more accurate,
but it doesn't matter in practice.

>  		return 0;
>  
>  	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT: