Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp1775283ybl; Sat, 11 Jan 2020 02:34:26 -0800 (PST) X-Google-Smtp-Source: APXvYqyL7iCtDLnIFowczR3FSqnhM6gXJJrZ0BvhU8Y1TjpWyfPS0A90JdVC8pwVphdYGahzg2m2 X-Received: by 2002:a05:6808:4cc:: with SMTP id a12mr5991808oie.115.1578738866035; Sat, 11 Jan 2020 02:34:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578738866; cv=none; d=google.com; s=arc-20160816; b=A7OqkEwxXlRMeqBEpzt47is0dK9MpYWWcc+O+Z5DtOlajFCx6bnq6gxk5OJr6TJvUH 2/OoA6P4ioi5XQnTY9ilTOzdONTLWY3eQh6SOB/qkSZ2KmzwdDRcYs4+TXfs9pqHwzoo WYo5oVB70zLMHbjfGZCUlqD8BkaRdWCCu4UGF5A+QdhwZ9pWWZax7aznharnGBHuxH9o UiJ9Bxw2KABhFhRIrll+7FDRDJpvcIfjNr54wiXhDOe5IpuYvUWezSf/fzF0D82HyYG4 0frspqR3jwsNrV/hIkE3f+rO1XNibmJy2a6Kc10GnOgHZEGKwzDlvdensIHRGWk8T/OG /PSA== 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=A2ddK//2kxjoDpDIlaDmfoBA+Nzufaxv01dqyF2INtY=; b=LkzKzUl1vf+p3NUYsDI6BFPkD4GFNtJJp7Sc2au9Nr5SbINpFHTq48yqf1YAKf4WtO LjF0vW3KL3l2auG2FHPnv6liP1MpWkjBkGPz7jSrz5Gx15riFWJmdW+Y6TljYahhfSK6 apGqMjdeQz3e3j3+m9rGtuYhvLKd3hKsMKuXnAPQ8aSq+RuTb01DickJBCXiKkQj1P0p u7fDNJDyFS2DiOHlvWJKHCkFqRdnPPphRpiFDdLqZhSiWGhy1ALnFYGJkPGsyPvS7kNb kvif2yjNvqeye2ije6rZlfoL2+lVaeqJyIgDqg1ya4Ll0042VL3YKBbbkk17DO0K+IHZ dntg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ATaFfo20; 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 j5si2683220oii.114.2020.01.11.02.34.14; Sat, 11 Jan 2020 02:34:26 -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=ATaFfo20; 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 S1731597AbgAKKdV (ORCPT + 99 others); Sat, 11 Jan 2020 05:33:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:47638 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731514AbgAKKdS (ORCPT ); Sat, 11 Jan 2020 05:33:18 -0500 Received: from localhost (unknown [62.119.166.9]) (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 258A320842; Sat, 11 Jan 2020 10:33:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578738797; bh=3s5JAX5Q2ODEjcC2HpUaI66ihhczXZpmWqli7dJibxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ATaFfo20IkngoTDMZUK5hCOVAQBwZf/0VXTcrJH9miBnIU2MUhs5XwQ8wZZXySMXx w9ae/4kQjc4AXOE4lOkEPCIeVzsQ5YONt/rCyqzxoQ0BM8rqnboBc/vuKjWGiUz/Ww xUO1n3fvQw4OShYchTBQzCI+aVnp0gqE6bBeZ+KY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wen Yang , Kevin Darbyshire-Bryant , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , "David S. Miller" , Cong Wang , cake@lists.bufferbloat.net, netdev@vger.kernel.org, =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Subject: [PATCH 5.4 147/165] sch_cake: avoid possible divide by zero in cake_enqueue() Date: Sat, 11 Jan 2020 10:51:06 +0100 Message-Id: <20200111094939.776468385@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094921.347491861@linuxfoundation.org> References: <20200111094921.347491861@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 [ Upstream commit 68aab823c223646fab311f8a6581994facee66a0 ] The variables 'window_interval' is u64 and do_div() truncates it to 32 bits, which means it can test non-zero and be truncated to zero for division. The unit of window_interval is nanoseconds, so its lower 32-bit is relatively easy to exceed. Fix this issue by using div64_u64() instead. Fixes: 7298de9cd725 ("sch_cake: Add ingress mode") Signed-off-by: Wen Yang Cc: Kevin Darbyshire-Bryant Cc: Toke Høiland-Jørgensen Cc: David S. Miller Cc: Cong Wang Cc: cake@lists.bufferbloat.net Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Acked-by: Toke Høiland-Jørgensen Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sched/sch_cake.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -1769,7 +1769,7 @@ static s32 cake_enqueue(struct sk_buff * q->avg_window_begin)); u64 b = q->avg_window_bytes * (u64)NSEC_PER_SEC; - do_div(b, window_interval); + b = div64_u64(b, window_interval); q->avg_peak_bandwidth = cake_ewma(q->avg_peak_bandwidth, b, b > q->avg_peak_bandwidth ? 2 : 8);