Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4630581ybl; Wed, 22 Jan 2020 01:37:12 -0800 (PST) X-Google-Smtp-Source: APXvYqwOB9vnCbCU/+cdXXTj2FuVw46XjBTzHaNN97nOuksBsneOZ8N+VxR4QgEEJnFn1qiZWiyz X-Received: by 2002:a05:6808:2ce:: with SMTP id a14mr6249505oid.82.1579685832495; Wed, 22 Jan 2020 01:37:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579685832; cv=none; d=google.com; s=arc-20160816; b=rQDNGFmDDFnOROQVorNgf3Bf4wIGaJGVYevTe/n5HS8HKkAGUnu2IaIo6vnGqTVgyF np3gZBQiksz1vihzgP9b1+GSGgWeQagkXzPJj0/o2CiaRlCgFA3Hktz1XaMpTj8j2kas wjPFEwW8qpbeHLpK7XMWr6NvvbN/qv2E2Mq2g47JWKzAQAYfM1/UiesEIWDomOtwZKKt 1lUUTIgK3aVRZaAmFfjGDhO3AOq60T8sa8UrJMTU9f0Bpf1QgjHHa0xhmcSzFOht3oNt LK2O9e+C5hAT3R9AzEarpn4v7xFPaMrMT3idMK9m7TP7/6+wgoxcRTa4a3tgTsyXdxIj XWEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=5jfKe86css1Cucsg/vFnVBvXU8G/+PMv4P2dvVP39gI=; b=SDtxe+bGxWUi9Neq0sdtbKQewryiMHwhajLq2XOhrX2v9zpPgNd0dHW756sdE3b2Af c1w2e0dPbU38nxLrQBA9/69pAW6+6wwTR2sU7xe5MOivHkPDMCrFIpQOJdivG3eCIl5b F/yQslGntULMRpHNJXQUMFz0NCNRt5XR2js/st3ETAYf3Me85VNFnOQdQ5/JSlBjooFF Vj6/T6lSzja3hObhcu/tnHgemNyndXxPlgI39vH8shz8XXxjW1K3UCuzaOYxNpAqYMt/ hvqgsqM42PxPvWAb5AWODcN+P4ALWvtKjCKOyKlUWS9NgeWZfsjbpBjgb/4EUGbyw9zu LNvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="W/YfMRRK"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v23si22519971otk.321.2020.01.22.01.37.00; Wed, 22 Jan 2020 01:37:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="W/YfMRRK"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731590AbgAVJgE (ORCPT + 99 others); Wed, 22 Jan 2020 04:36:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:51324 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730935AbgAVJf7 (ORCPT ); Wed, 22 Jan 2020 04:35:59 -0500 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 567002467C; Wed, 22 Jan 2020 09:35:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685757; bh=tAEX8k+O68fJuZfYx6mQBJTYLpBE2CrVhQuydpAimMg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W/YfMRRK776OLNqgyR1n+DXJube5+rbwcwptAgLphvAmiHcm7txYrRMiqHcckYRxG NtsJwgW3/62T2m4yOZWBTWiPEJTh/VlDHYvPAjJEfObgYkLG2oBtOa2ChiN8S0sCXt nSjIjJRVIkqiFOHutP14GeHyN2Ij1XLa0eGFFEec= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wen Yang , Andrew Morton , Qian Cai , Tejun Heo , Jens Axboe , Linus Torvalds Subject: [PATCH 4.9 68/97] mm/page-writeback.c: avoid potential division by zero in wb_min_max_ratio() Date: Wed, 22 Jan 2020 10:29:12 +0100 Message-Id: <20200122092807.307956778@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092755.678349497@linuxfoundation.org> References: <20200122092755.678349497@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 From: Wen Yang commit 6d9e8c651dd979aa666bee15f086745f3ea9c4b3 upstream. Patch series "use div64_ul() instead of div_u64() if the divisor is unsigned long". We were first inspired by commit b0ab99e7736a ("sched: Fix possible divide by zero in avg_atom () calculation"), then refer to the recently analyzed mm code, we found this suspicious place. 201 if (min) { 202 min *= this_bw; 203 do_div(min, tot_bw); 204 } And we also disassembled and confirmed it: /usr/src/debug/kernel-4.9.168-016.ali3000/linux-4.9.168-016.ali3000.alios7.x86_64/mm/page-writeback.c: 201 0xffffffff811c37da <__wb_calc_thresh+234>: xor %r10d,%r10d 0xffffffff811c37dd <__wb_calc_thresh+237>: test %rax,%rax 0xffffffff811c37e0 <__wb_calc_thresh+240>: je 0xffffffff811c3800 <__wb_calc_thresh+272> /usr/src/debug/kernel-4.9.168-016.ali3000/linux-4.9.168-016.ali3000.alios7.x86_64/mm/page-writeback.c: 202 0xffffffff811c37e2 <__wb_calc_thresh+242>: imul %r8,%rax /usr/src/debug/kernel-4.9.168-016.ali3000/linux-4.9.168-016.ali3000.alios7.x86_64/mm/page-writeback.c: 203 0xffffffff811c37e6 <__wb_calc_thresh+246>: mov %r9d,%r10d ---> truncates it to 32 bits here 0xffffffff811c37e9 <__wb_calc_thresh+249>: xor %edx,%edx 0xffffffff811c37eb <__wb_calc_thresh+251>: div %r10 0xffffffff811c37ee <__wb_calc_thresh+254>: imul %rbx,%rax 0xffffffff811c37f2 <__wb_calc_thresh+258>: shr $0x2,%rax 0xffffffff811c37f6 <__wb_calc_thresh+262>: mul %rcx 0xffffffff811c37f9 <__wb_calc_thresh+265>: shr $0x2,%rdx 0xffffffff811c37fd <__wb_calc_thresh+269>: mov %rdx,%r10 This series uses div64_ul() instead of div_u64() if the divisor is unsigned long, to avoid truncation to 32-bit on 64-bit platforms. This patch (of 3): The variables 'min' and 'max' 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. Link: http://lkml.kernel.org/r/20200102081442.8273-2-wenyang@linux.alibaba.com Fixes: 693108a8a667 ("writeback: make bdi->min/max_ratio handling cgroup writeback aware") Signed-off-by: Wen Yang Reviewed-by: Andrew Morton Cc: Qian Cai Cc: Tejun Heo Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- mm/page-writeback.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -200,11 +200,11 @@ static void wb_min_max_ratio(struct bdi_ if (this_bw < tot_bw) { if (min) { min *= this_bw; - do_div(min, tot_bw); + min = div64_ul(min, tot_bw); } if (max < 100) { max *= this_bw; - do_div(max, tot_bw); + max = div64_ul(max, tot_bw); } }