From 9fa42d2eeaa8501f0fda4fca96d6bca128e33920 Mon Sep 17 00:00:00 2001 From: YueHaibing Date: Tue, 22 Sep 2020 10:12:34 +0800 Subject: [PATCH] act_mirred: Fix mirred_init_module error handling stable inclusion from linux-4.19.99 commit 5c1b003d22aba2ff0853f0e775c3cfa7e42522cd -------------------------------- [ Upstream commit 11c9a7d38af524217efb7a176ad322b97ac2f163 ] 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 Signed-off-by: Sasha Levin Signed-off-by: Yang Yingliang Signed-off-by: Li Aichun Reviewed-by: guodeqing Signed-off-by: Yang Yingliang --- net/sched/act_mirred.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index bfe0d8638a50..9ee7c7f479fc 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c @@ -447,7 +447,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) -- GitLab