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.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,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 B4C7CC2D0DC for ; Wed, 1 Jan 2020 09:32:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2561C2073D for ; Wed, 1 Jan 2020 09:32:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2561C2073D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 783578E0005; Wed, 1 Jan 2020 04:32:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 70C148E0003; Wed, 1 Jan 2020 04:32:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FA3D8E0005; Wed, 1 Jan 2020 04:32:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0214.hostedemail.com [216.40.44.214]) by kanga.kvack.org (Postfix) with ESMTP id 468668E0003 for ; Wed, 1 Jan 2020 04:32:20 -0500 (EST) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id BAA648249980 for ; Wed, 1 Jan 2020 09:32:19 +0000 (UTC) X-FDA: 76328549598.24.love77_14343a8502d63 X-HE-Tag: love77_14343a8502d63 X-Filterd-Recvd-Size: 3159 Received: from out30-42.freemail.mail.aliyun.com (out30-42.freemail.mail.aliyun.com [115.124.30.42]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Wed, 1 Jan 2020 09:32:18 +0000 (UTC) X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R721e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01f04446;MF=wenyang@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0TmU9qf5_1577871126; Received: from localhost(mailfrom:wenyang@linux.alibaba.com fp:SMTPD_---0TmU9qf5_1577871126) by smtp.aliyun-inc.com(127.0.0.1); Wed, 01 Jan 2020 17:32:14 +0800 From: Wen Yang To: Andrew Morton Cc: xlpang@linux.alibaba.com, Wen Yang , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm/page-writeback.c: avoid potential division by zero Date: Wed, 1 Jan 2020 17:32:04 +0800 Message-Id: <20200101093204.3592-1-wenyang@linux.alibaba.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The variables 'min', 'max' and 'bw' are unsigned long and do_div truncates them to 32 bits, which means it can test non-zero and be truncated to zero for division. Fix this issue by using div64_ul() instead. For the two variables 'numerator' and 'denominator', though they are declared as long, they should actually be unsigned long (according to the implementation of the fprop_fraction_percpu() function). Signed-off-by: Wen Yang Cc: Andrew Morton Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org --- mm/page-writeback.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 50055d2..2caf780 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -201,11 +201,11 @@ static void wb_min_max_ratio(struct bdi_writeback *= wb, if (this_bw < tot_bw) { if (min) { min *=3D this_bw; - do_div(min, tot_bw); + min =3D div64_ul(min, tot_bw); } if (max < 100) { max *=3D this_bw; - do_div(max, tot_bw); + max =3D div64_ul(max, tot_bw); } } =20 @@ -766,7 +766,7 @@ static unsigned long __wb_calc_thresh(struct dirty_th= rottle_control *dtc) struct wb_domain *dom =3D dtc_dom(dtc); unsigned long thresh =3D dtc->thresh; u64 wb_thresh; - long numerator, denominator; + unsigned long numerator, denominator; unsigned long wb_min_ratio, wb_max_ratio; =20 /* @@ -777,7 +777,7 @@ static unsigned long __wb_calc_thresh(struct dirty_th= rottle_control *dtc) =20 wb_thresh =3D (thresh * (100 - bdi_min_ratio)) / 100; wb_thresh *=3D numerator; - do_div(wb_thresh, denominator); + wb_thresh =3D div64_ul(wb_thresh, denominator); =20 wb_min_max_ratio(dtc->wb, &wb_min_ratio, &wb_max_ratio); =20 @@ -1102,7 +1102,7 @@ static void wb_update_write_bandwidth(struct bdi_wr= iteback *wb, bw =3D written - min(written, wb->written_stamp); bw *=3D HZ; if (unlikely(elapsed > period)) { - do_div(bw, elapsed); + bw =3D div64_ul(bw, elapsed); avg =3D bw; goto out; } --=20 1.8.3.1