| Message ID | 20190621134437.4252-1-yuehaibing@huawei.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | net/sched: cbs: Fix error path of cbs_module_init | expand |
From: YueHaibing <yuehaibing@huawei.com> Date: Fri, 21 Jun 2019 21:44:37 +0800 > If register_qdisc fails, we should unregister > netdevice notifier. > > Reported-by: Hulk Robot <hulkci@huawei.com> > Fixes: e0a7683d30e9 ("net/sched: cbs: fix port_rate miscalculation") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Applied.
diff --git a/net/sched/sch_cbs.c b/net/sched/sch_cbs.c index e16a3d3..4e1a878 100644 --- a/net/sched/sch_cbs.c +++ b/net/sched/sch_cbs.c @@ -549,12 +549,17 @@ static struct notifier_block cbs_device_notifier = { static int __init cbs_module_init(void) { - int err = register_netdevice_notifier(&cbs_device_notifier); + int err; + err = register_netdevice_notifier(&cbs_device_notifier); if (err) return err; - return register_qdisc(&cbs_qdisc_ops); + err = register_qdisc(&cbs_qdisc_ops); + if (err) + unregister_netdevice_notifier(&cbs_device_notifier); + + return err; } static void __exit cbs_module_exit(void)
If register_qdisc fails, we should unregister netdevice notifier. Reported-by: Hulk Robot <hulkci@huawei.com> Fixes: e0a7683d30e9 ("net/sched: cbs: fix port_rate miscalculation") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- net/sched/sch_cbs.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)