net_sched: initialize timer earlier in red_init()
Subsystems (3)
PATCH 1/1 net_sched: initialize timer earlier in red_init()
When red_init() fails, red_destroy() is called to clean up. If the timer is not initialized yet, del_timer_sync() will complain. So we have to move timer_setup() before any failure.
--- net/sched/sch_red.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/sched/sch_red.c +4 -4
@@ -333,6 +333,10 @@ static int red_init(struct Qdisc *sch, struct nlattr *opt,struct nlattr *tb[TCA_RED_MAX +1 ];int err; + q->qdisc = &noop_qdisc; + q->sch = sch; +timer_setup (&q->adapt_timer, red_adaptative_timer,0 ); +if (!opt)return -EINVAL ;
@@ -341,10 +345,6 @@ static int red_init(struct Qdisc *sch, struct nlattr *opt,if (err <0 )return err; - q->qdisc = &noop_qdisc; - q->sch = sch; -timer_setup (&q->adapt_timer, red_adaptative_timer,0 ); - err =__red_change (sch, tb, extack);if (err)return err;
Signature · 1 line
2.27.0
Quoted 10 lines · Cong Wang
When
red_init()fails,red_destroy()is called to clean up. If the timer is not initialized yet,del_timer_sync()will complain. So we have to movetimer_setup()before any failure.Reported-and-tested-by [email protected]Fixes aee9caa03fc3 ("net: sched: sch_red: Add qevents "early_drop" and "mark"")Cc Petr Machata <[email protected]>Cc Jamal Hadi Salim <[email protected]>Cc Jiri Pirko <[email protected]>Signed-off-by Cong Wang <[email protected]>
Ah, correct, this used to be done in red_init() not only before calling red_change(), but actually before doing anything that can fail. Thanks for fixing this.
Quoted 30 lines
--- net/sched/sch_red.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)net/sched/sch_red.c +4
-4@@ -333,6 +333,10 @@ static int red_init(struct Qdisc *sch, struct nlattr *opt,struct nlattr *tb[TCA_RED_MAX +1 ];int err; + q->qdisc = &noop_qdisc; + q->sch = sch; +timer_setup (&q->adapt_timer, red_adaptative_timer,0 ); +if (!opt)return -EINVAL ;@@ -341,10 +345,6 @@ static int red_init(struct Qdisc *sch, struct nlattr *opt,if (err <0 )return err; - q->qdisc = &noop_qdisc; - q->sch = sch; -timer_setup (&q->adapt_timer, red_adaptative_timer,0 ); - err =__red_change (sch, tb, extack);if (err)return err;
From: Cong Wang <[email protected]>
Date: Sat, 25 Jul 2020 13:17:07 -0700
Quoted 10 lines
When
red_init()fails,red_destroy()is called to clean up. If the timer is not initialized yet,del_timer_sync()will complain. So we have to movetimer_setup()before any failure.Reported-and-tested-by [email protected]Fixes aee9caa03fc3 ("net: sched: sch_red: Add qevents "early_drop" and "mark"")Cc Petr Machata <[email protected]>Cc Jamal Hadi Salim <[email protected]>Cc Jiri Pirko <[email protected]>Signed-off-by Cong Wang <[email protected]>
Applied, thank you.