On Tue, 2023-02-21 at 09:41 +0100, Greg Kroah-Hartman wrote: > On Tue, Feb 21, 2023 at 08:45:18AM +0100, Paolo Abeni wrote: > > Hello, > > > > On Mon, 2023-02-20 at 14:35 +0100, Greg Kroah-Hartman wrote: > > > From: Kees Cook <keescook@xxxxxxxxxxxx> > > > > > > [ Upstream commit de5ca4c3852f896cacac2bf259597aab5e17d9e3 ] > > > > > > Nothing was explicitly bounds checking the priority index used to access > > > clpriop[]. WARN and bail out early if it's pathological. Seen with GCC 13: > > > > > > ../net/sched/sch_htb.c: In function 'htb_activate_prios': > > > ../net/sched/sch_htb.c:437:44: warning: array subscript [0, 31] is outside array bounds of 'struct htb_prio[8]' [-Warray-bounds=] > > > 437 | if (p->inner.clprio[prio].feed.rb_node) > > > | ~~~~~~~~~~~~~~~^~~~~~ > > > ../net/sched/sch_htb.c:131:41: note: while referencing 'clprio' > > > 131 | struct htb_prio clprio[TC_HTB_NUMPRIO]; > > > | ^~~~~~ > > > > > > Cc: Jamal Hadi Salim <jhs@xxxxxxxxxxxx> > > > Cc: Cong Wang <xiyou.wangcong@xxxxxxxxx> > > > Cc: Jiri Pirko <jiri@xxxxxxxxxxx> > > > Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> > > > Cc: Eric Dumazet <edumazet@xxxxxxxxxx> > > > Cc: Jakub Kicinski <kuba@xxxxxxxxxx> > > > Cc: Paolo Abeni <pabeni@xxxxxxxxxx> > > > Cc: netdev@xxxxxxxxxxxxxxx > > > Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> > > > Reviewed-by: Simon Horman <simon.horman@xxxxxxxxxxxx> > > > Reviewed-by: Cong Wang <cong.wang@xxxxxxxxxxxxx> > > > Link: https://lore.kernel.org/r/20230127224036.never.561-kees@xxxxxxxxxx > > > Signed-off-by: Paolo Abeni <pabeni@xxxxxxxxxx> > > > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > > > > This one has a follow-up which I don't see among the patches reaching > > the netdev ML: > > > > commit 9cec2aaffe969f2a3e18b5ec105fc20bb908e475 > > Author: Dan Carpenter <error27@xxxxxxxxx> > > Date: Mon Feb 6 16:18:32 2023 +0300 > > > > net: sched: sch: Fix off by one in htb_activate_prios() > > This too is in the queue for 5.4 and newer kernels, are you sure you > didn't miss that in this series? I missed it, sorry. I checked only my inbox and netdev, and it was not there, but I see it in the stable queue. Sorry for the noise, Paolo
