From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x144.google.com (mail-il1-x144.google.com [IPv6:2607:f8b0:4864:20::144]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.bufferbloat.net (Postfix) with ESMTPS id 3298D3B29E for ; Sat, 11 Jan 2020 15:40:58 -0500 (EST) Received: by mail-il1-x144.google.com with SMTP id t17so4648488ilm.13 for ; Sat, 11 Jan 2020 12:40:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:cc :content-transfer-encoding; bh=/9rDgDR29UyCcUFDE/Z04bzV4SrZnGY9LBiyFOR/HOM=; b=ZF+CQylk1a8Kl+tXZrgmu6c+0jMTFp9EymP/gqqC22eiSlMeyXrG9M1pgp+aul7hEY ShuBo43OC96P8730PdP1g+lhuDFiAcktkgTf2ogCdLzcSq4qelFtqh9SH6SX+Orp9eeP Bor+U/CWGj9EQuQ52aIfZTwjN08xQYDzECqNEFweTM0IaJzvw6mAoGaY2vmkOZLJAZ4B McX1CuJB4Ti05oS18J5/3+axM/z5zkARUt47XWRAwsxcWfLScZk/DE+HSb+Ymq6vU3gL NL+56uXbERpJGfbt7h4pTGOR6o4VR7aLzobW03tFgsAsUAG5/5s1CWkpPUY2SsjJtgUm vn8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:cc:content-transfer-encoding; bh=/9rDgDR29UyCcUFDE/Z04bzV4SrZnGY9LBiyFOR/HOM=; b=F7J+Vpr0OPtkYo+9r6yK64iBpFOj+MSCAO92I0MbWcJK4cl/hRFr4QAbtfGcNbxCKC qyDC5PCElnojgiROSuSzHN8y6p4p7rOTVJ/M/xuQGB+Um/Hu7RuTD/kYUSbJl5MyLcxM /VEweA3uUr6yTwpLG3QXcKsdcR+p3b9FW1QdvnM32OFLy2IbKEf7UJ5bz2krrsQc8Jl6 YlqGaAO1bGqJgyGcuhFvOyfj2JM+VyrKhDDbK5wF/BgTaUIrQ8lHm0rykYjAkC45EAb0 DRCzMWnFC/FhbFVV+a7m0JfQp7eHC5weJZbA0aWljSJ9MUT0vj2aGOUBR1keBK760rQN cwkA== X-Gm-Message-State: APjAAAX6BcLygDOb2hglSM7iGr23S3jjMUXJi7dsAsg7Udvkehzgknf1 8Oy4OzJ4s2BLD8NKCJOvAzvDwI+X6OB23guxEy+7/EkiJYE= X-Received: by 2002:a05:6e02:5c8:: with SMTP id l8mt8359817ils.287.1578775257563; Sat, 11 Jan 2020 12:40:57 -0800 (PST) MIME-Version: 1.0 References: <1578730684729@kroah.com> In-Reply-To: <1578730684729@kroah.com> From: Dave Taht Date: Sat, 11 Jan 2020 12:40:46 -0800 Message-ID: Cc: Cake List , "Kevin 'ldir' Darbyshire-Bryant" , =?UTF-8?B?VG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2Vu?= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [Cake] Patch "sch_cake: avoid possible divide by zero in cake_enqueue()" has been added to the 4.19-stable tree X-BeenThere: cake@lists.bufferbloat.net X-Mailman-Version: 2.1.20 Precedence: list List-Id: Cake - FQ_codel the next generation List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jan 2020 20:40:58 -0000 did this make it into openwrt already? On Sat, Jan 11, 2020 at 12:19 AM wrote: > > > 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=3Dlinux/kernel/git/stable/stable-queue.g= it;a=3Dsummary > > 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 know about it. > > > From foo@baz Sat 11 Jan 2020 09:14:34 AM CET > From: Wen Yang > Date: Thu, 2 Jan 2020 17:21:43 +0800 > Subject: sch_cake: avoid possible divide by zero in cake_enqueue() > > 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=C3=B8iland-J=C3=B8rgensen > 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=C3=B8iland-J=C3=B8rgensen > 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 > @@ -1758,7 +1758,7 @@ static s32 cake_enqueue(struct sk_buff * > q->avg_window_begin= )); > u64 b =3D q->avg_window_bytes * (u64)NSEC_PER_SEC= ; > > - do_div(b, window_interval); > + b =3D div64_u64(b, window_interval); > q->avg_peak_bandwidth =3D > 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.aliba= ba.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 > _______________________________________________ > Cake mailing list > Cake@lists.bufferbloat.net > https://lists.bufferbloat.net/listinfo/cake --=20 Make Music, Not War Dave T=C3=A4ht CTO, TekLibre, LLC http://www.teklibre.com Tel: 1-831-435-0729