* [Patch net] net_sched: check cops->tcf_block in tc_bind_tclass()
@ 2019-09-08 19:11 Cong Wang
2019-09-10 17:29 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Cong Wang @ 2019-09-08 19:11 UTC (permalink / raw)
To: netdev; +Cc: Cong Wang, syzbot+21b29db13c065852f64b, Jamal Hadi Salim,
Jiri Pirko
At least sch_red and sch_tbf don't implement ->tcf_block()
while still have a non-zero tc "class".
Instead of adding nop implementations to each of such qdisc's,
we can just relax the check of cops->tcf_block() in
tc_bind_tclass(). They don't support TC filter anyway.
Reported-by: syzbot+21b29db13c065852f64b@syzkaller.appspotmail.com
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
---
net/sched/sch_api.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 04faee7ccbce..1047825d9f48 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -1920,6 +1920,8 @@ static void tc_bind_tclass(struct Qdisc *q, u32 portid, u32 clid,
cl = cops->find(q, portid);
if (!cl)
return;
+ if (!cops->tcf_block)
+ return;
block = cops->tcf_block(q, cl, NULL);
if (!block)
return;
--
2.21.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Patch net] net_sched: check cops->tcf_block in tc_bind_tclass()
2019-09-08 19:11 [Patch net] net_sched: check cops->tcf_block in tc_bind_tclass() Cong Wang
@ 2019-09-10 17:29 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2019-09-10 17:29 UTC (permalink / raw)
To: xiyou.wangcong; +Cc: netdev, syzbot+21b29db13c065852f64b, jhs, jiri
From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Sun, 8 Sep 2019 12:11:23 -0700
> At least sch_red and sch_tbf don't implement ->tcf_block()
> while still have a non-zero tc "class".
>
> Instead of adding nop implementations to each of such qdisc's,
> we can just relax the check of cops->tcf_block() in
> tc_bind_tclass(). They don't support TC filter anyway.
>
> Reported-by: syzbot+21b29db13c065852f64b@syzkaller.appspotmail.com
> Cc: Jamal Hadi Salim <jhs@mojatatu.com>
> Cc: Jiri Pirko <jiri@resnulli.us>
> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-10 17:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-08 19:11 [Patch net] net_sched: check cops->tcf_block in tc_bind_tclass() Cong Wang
2019-09-10 17:29 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox