From cec58f9fb6007c5b3b6990a3b6d584016a4325fe Mon Sep 17 00:00:00 2001 From: gebidelidaye Date: Mon, 8 Jun 2020 10:58:37 +0800 Subject: [PATCH 1/2] update drivers/net/netdevsim/fib.c. fix netdevsim resource leak --- drivers/net/netdevsim/fib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/netdevsim/fib.c b/drivers/net/netdevsim/fib.c index f61d094746c0..d9ce3a8e3283 100644 --- a/drivers/net/netdevsim/fib.c +++ b/drivers/net/netdevsim/fib.c @@ -241,8 +241,8 @@ static struct pernet_operations nsim_fib_net_ops = { void nsim_fib_exit(void) { - unregister_pernet_subsys(&nsim_fib_net_ops); unregister_fib_notifier(&nsim_fib_nb); + unregister_pernet_subsys(&nsim_fib_net_ops); } int nsim_fib_init(void) @@ -257,6 +257,7 @@ int nsim_fib_init(void) err = register_fib_notifier(&nsim_fib_nb, nsim_fib_dump_inconsistent); if (err < 0) { + unregister_pernet_subsys(&nsim_fib_net_ops); pr_err("Failed to register fib notifier\n"); goto err_out; } -- Gitee From 6aece2e307acf3a10c9731d38df67cd81995f84e Mon Sep 17 00:00:00 2001 From: gebidelidaye Date: Mon, 8 Jun 2020 11:01:29 +0800 Subject: [PATCH 2/2] update drivers/net/netdevsim/fib.c. --- drivers/net/netdevsim/fib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/netdevsim/fib.c b/drivers/net/netdevsim/fib.c index d9ce3a8e3283..d5c01b8613b7 100644 --- a/drivers/net/netdevsim/fib.c +++ b/drivers/net/netdevsim/fib.c @@ -257,7 +257,7 @@ int nsim_fib_init(void) err = register_fib_notifier(&nsim_fib_nb, nsim_fib_dump_inconsistent); if (err < 0) { - unregister_pernet_subsys(&nsim_fib_net_ops); + unregister_pernet_subsys(&nsim_fib_net_ops); pr_err("Failed to register fib notifier\n"); goto err_out; } -- Gitee