mctp: Fix an error handling path in mctp_init()

[ Upstream commit d4072058af4fd8fb4658e7452289042a406a9398 ]

If mctp_neigh_init() return error, the routes resources should
be released in the error handling path. Otherwise some resources
leak.

Fixes: 4d8b9319282a ("mctp: Add neighbour implementation")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Acked-by: Matt Johnston <matt@codeconstruct.com.au>
Link: https://lore.kernel.org/r/20221108095517.620115-1-weiyongjun@huaweicloud.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/mctp/af_mctp.c b/net/mctp/af_mctp.c
index 85cc1a28cbe9f1cd15a7dbda705e11dd7cda5110..cbbde0f73a08cc7ca1254ebcb387596aec25751d 100644 (file)
--- a/net/mctp/af_mctp.c
+++ b/net/mctp/af_mctp.c
@@ -375,12 +375,14 @@ static __init int mctp_init(void)
 
        rc = mctp_neigh_init();
        if (rc)
-               goto err_unreg_proto;
+               goto err_unreg_routes;
 
        mctp_device_init();
 
        return 0;
 
+err_unreg_routes:
+       mctp_routes_exit();
 err_unreg_proto:
        proto_unregister(&mctp_proto);
 err_unreg_sock:

diff --git a/net/mctp/route.c b/net/mctp/route.c
index bbb13dbc9227d8ecc5bfb833afe9b4dd15c35c17..6aebb4a3eded063d81df6718b5dc2ef66892d71d 100644 (file)
--- a/net/mctp/route.c
+++ b/net/mctp/route.c
@@ -1109,7 +1109,7 @@ int __init mctp_routes_init(void)
        return register_pernet_subsys(&mctp_net_ops);
 }
 
-void __exit mctp_routes_exit(void)
+void mctp_routes_exit(void)
 {
        unregister_pernet_subsys(&mctp_net_ops);
        rtnl_unregister(PF_MCTP, RTM_DELROUTE);