net_sched: let qdisc_put() accept NULL pointer
Subsystems (3)
PATCH v2 1/1 net_sched: let qdisc_put() accept NULL pointer
When tcf_block_get() fails in sfb_init(), q->qdisc is still a NULL pointer which leads to a crash in sfb_destroy(). Similar for sch_dsmark.
Instead of fixing each separately, Linus suggested to just accept NULL pointer in qdisc_put(), which would make callers easier.
(For sch_dsmark, the bug probably exists long before commit 6529eaba33f0.)
--- net/sched/sch_generic.c | 3 +++ 1 file changed, 3 insertions(+)
net/sched/sch_generic.c +3 -0
@@ -985,6 +985,9 @@ static void qdisc_destroy(struct Qdisc *qdisc)void qdisc_put (struct Qdisc *qdisc) { +if (!qdisc) +return ; +if (qdisc->flags &TCQ_F_BUILTIN || !refcount_dec_and_test (&qdisc->refcnt))return ;
Signature · 1 line
2.21.0
Quoted 10 lines · Thu, Sep 12, 2019 at 07:22:30PM CEST, [email protected] wrote:
When
tcf_block_get()fails insfb_init(),q->qdiscis still a NULL pointer which leads to a crash insfb_destroy(). Similar forsch_dsmark.Instead of fixing each separately, Linus suggested to just accept NULL pointer in
qdisc_put(), which would make callers easier.(For
sch_dsmark, the bug probably exists long before commit6529eaba33f0.)
Quoted 6 lines
Fixes 6529eaba33f0 ("net: sched: introduce tcf block infractructure")Reported-by [email protected]Suggested-by Linus Torvalds <[email protected]>Cc Jamal Hadi Salim <[email protected]>Cc Jiri Pirko <[email protected]>Signed-off-by Cong Wang <[email protected]>
Thanks!
David Miller
maintainerFrom: Cong Wang <[email protected]>
Date: Thu, 12 Sep 2019 10:22:30 -0700
Quoted 7 lines
When
tcf_block_get()fails insfb_init(),q->qdiscis still a NULL pointer which leads to a crash insfb_destroy(). Similar forsch_dsmark.Instead of fixing each separately, Linus suggested to just accept NULL pointer in
qdisc_put(), which would make callers easier.
Quoted 7 lines
(For
sch_dsmark, the bug probably exists long before commit6529eaba33f0.)Fixes 6529eaba33f0 ("net: sched: introduce tcf block infractructure")Reported-by [email protected]Suggested-by Linus Torvalds <[email protected]>Signed-off-by Cong Wang <[email protected]>
Applied and queued up for -stable, thanks.