Cake - FQ_codel the next generation
 help / color / mirror / Atom feed
From: <gregkh@linuxfoundation.org>
To: cake@lists.bufferbloat.net, davem@davemloft.net,
	gregkh@linuxfoundation.org, ldir@darbyshire-bryant.me.uk,
	toke@redhat.com, toke@toke.dk, wenyang@linux.alibaba.com,
	xiyou.wangcong@gmail.com
Cc: <stable-commits@vger.kernel.org>
Subject: [Cake] Patch "sch_cake: avoid possible divide by zero in cake_enqueue()" has been added to the 4.19-stable tree
Date: Sat, 11 Jan 2020 09:18:04 +0100	[thread overview]
Message-ID: <1578730684729@kroah.com> (raw)


This is a note to let you know that I've just added the patch titled

    sch_cake: avoid possible divide by zero in cake_enqueue()

to the 4.19-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     sch_cake-avoid-possible-divide-by-zero-in-cake_enqueue.patch
and it can be found in the queue-4.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


From foo@baz Sat 11 Jan 2020 09:14:34 AM CET
From: Wen Yang <wenyang@linux.alibaba.com>
Date: Thu, 2 Jan 2020 17:21:43 +0800
Subject: sch_cake: avoid possible divide by zero in cake_enqueue()

From: Wen Yang <wenyang@linux.alibaba.com>

[ 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 <wenyang@linux.alibaba.com>
Cc: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Cc: Toke Høiland-Jørgensen <toke@redhat.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Cc: cake@lists.bufferbloat.net
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 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
@@ -1758,7 +1758,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);


Patches currently in stable-queue which might be from wenyang@linux.alibaba.com are

queue-4.19/sch_cake-avoid-possible-divide-by-zero-in-cake_enqueue.patch
queue-4.19/regulator-fix-use-after-free-issue.patch

             reply	other threads:[~2020-01-11  8:19 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-11  8:18 gregkh [this message]
2020-01-11 20:40 ` Dave Taht
2020-01-11 21:20   ` Kevin 'ldir' Darbyshire-Bryant
2020-01-11 21:38     ` Dave Taht
2020-01-12  9:53       ` Kevin 'ldir' Darbyshire-Bryant
2020-01-16 12:47       ` Sebastian Gottschall

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://lists.bufferbloat.net/postorius/lists/cake.lists.bufferbloat.net/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1578730684729@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=cake@lists.bufferbloat.net \
    --cc=davem@davemloft.net \
    --cc=ldir@darbyshire-bryant.me.uk \
    --cc=stable-commits@vger.kernel.org \
    --cc=toke@redhat.com \
    --cc=toke@toke.dk \
    --cc=wenyang@linux.alibaba.com \
    --cc=xiyou.wangcong@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox