From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1415BC282DD for ; Thu, 23 May 2019 19:19:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DFDD121841 for ; Thu, 23 May 2019 19:19:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558639144; bh=oaJYnaQdqWOwuiA3j1Yxlk+IcB46rchR/4L+SMQ/m4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=W10yJ0ENiBhjSOGnX14gJ4Iv2ykTByrxs+z6n8p762oJMM8CT3C1xx0aAaeTrWkW9 9f10V6NQCQXaHf4b/LViDUpSxp6nft87UDPpOxlyWeV10zdpaxylzcAdF3HDPjtBWT 7w+mJeZ1ZgGnj1IMzRMdoGnn25kKm7sY5u8s7FyM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389734AbfEWTTC (ORCPT ); Thu, 23 May 2019 15:19:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:54706 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389714AbfEWTS5 (ORCPT ); Thu, 23 May 2019 15:18:57 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CAD1E20863; Thu, 23 May 2019 19:18:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558639137; bh=oaJYnaQdqWOwuiA3j1Yxlk+IcB46rchR/4L+SMQ/m4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GV8i9sIaufWocFm2ROpm+wQKN+QyvefmBHjsURZLF2+ZnTyjDJPOXEx6rrpKW5WFu s45GsW2X2/+72gwylVo+SPcPMZlB2WNDa8dsXnoSkLjlVNGMuJsRLkpGFbAgDTL/yy fbmQNxKiXe8SefNEhSwA0hzzc9avkj16sVAFGBbE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tony Lindgren , Pavel Machek , Sebastian Reichel , Sasha Levin Subject: [PATCH 4.19 091/114] power: supply: cpcap-battery: Fix division by zero Date: Thu, 23 May 2019 21:06:30 +0200 Message-Id: <20190523181739.726666171@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181731.372074275@linuxfoundation.org> References: <20190523181731.372074275@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit dbe7208c6c4aec083571f2ec742870a0d0edbea3 ] If called fast enough so samples do not increment, we can get division by zero in kernel: __div0 cpcap_battery_cc_raw_div cpcap_battery_get_property power_supply_get_property.part.1 power_supply_get_property power_supply_show_property power_supply_uevent Fixes: 874b2adbed12 ("power: supply: cpcap-battery: Add a battery driver") Signed-off-by: Tony Lindgren Acked-by: Pavel Machek Signed-off-by: Sebastian Reichel Signed-off-by: Sasha Levin --- drivers/power/supply/cpcap-battery.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c index 98ba07869c3b0..3bae02380bb22 100644 --- a/drivers/power/supply/cpcap-battery.c +++ b/drivers/power/supply/cpcap-battery.c @@ -221,6 +221,9 @@ static int cpcap_battery_cc_raw_div(struct cpcap_battery_ddata *ddata, int avg_current; u32 cc_lsb; + if (!divider) + return 0; + sample &= 0xffffff; /* 24-bits, unsigned */ offset &= 0x7ff; /* 10-bits, signed */ -- 2.20.1