[PATCH] RDS: fix rds_tcp_init() error path

Subsystems: networking [general], rds - reliable datagram sockets, the rest

STALE3687d

2 messages, 2 authors, 2016-07-03 · open the first message on its own page

[PATCH] RDS: fix rds_tcp_init() error path

From: Vegard Nossum <hidden>
Date: 2016-07-03 08:55:00

If register_pernet_subsys() fails, we shouldn't try to call
unregister_pernet_subsys().

Fixes: 467fa15356 ("RDS-TCP: Support multiple RDS-TCP listen endpoints, one per netns.")
Cc: stable@vger.kernel.org
Cc: Sowmini Varadhan <redacted>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Vegard Nossum <redacted>
---
 net/rds/tcp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/rds/tcp.c b/net/rds/tcp.c
index 74ee126..c8a7b4c 100644
--- a/net/rds/tcp.c
+++ b/net/rds/tcp.c
@@ -616,7 +616,7 @@ static int rds_tcp_init(void)
 
 	ret = rds_tcp_recv_init();
 	if (ret)
-		goto out_slab;
+		goto out_pernet;
 
 	ret = rds_trans_register(&rds_tcp_transport);
 	if (ret)
@@ -628,8 +628,9 @@ static int rds_tcp_init(void)
 
 out_recv:
 	rds_tcp_recv_exit();
-out_slab:
+out_pernet:
 	unregister_pernet_subsys(&rds_tcp_net_ops);
+out_slab:
 	kmem_cache_destroy(rds_tcp_conn_slab);
 out:
 	return ret;
-- 
1.9.1

Re: [PATCH] RDS: fix rds_tcp_init() error path

From: Sowmini Varadhan <hidden>
Date: 2016-07-03 11:21:25

If register_pernet_subsys() fails, we shouldn't try to call
unregister_pernet_subsys().
Acked-by: Sowmini Varadhan <redacted>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help