From: YueHaibing Date: Wed, 9 Oct 2019 03:10:52 +0000 (+0800) Subject: act_mirred: Fix mirred_init_module error handling X-Git-Tag: v5.4-rc4~6^2~66 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=11c9a7d38af524217efb7a176ad322b97ac2f163;p=users%2Fjedix%2Flinux-maple.git act_mirred: Fix mirred_init_module error handling If tcf_register_action failed, mirred_device_notifier should be unregistered. Fixes: 3b87956ea645 ("net sched: fix race in mirred device removal") Signed-off-by: YueHaibing Signed-off-by: Jakub Kicinski --- diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index 9ce073a05414..08923b21e566 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c @@ -484,7 +484,11 @@ static int __init mirred_init_module(void) return err; pr_info("Mirror/redirect action on\n"); - return tcf_register_action(&act_mirred_ops, &mirred_net_ops); + err = tcf_register_action(&act_mirred_ops, &mirred_net_ops); + if (err) + unregister_netdevice_notifier(&mirred_device_notifier); + + return err; } static void __exit mirred_cleanup_module(void)