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

[David Miller]

From: Vegard Nossum 
Date: Sun,  3 Jul 2016 10:54:54 +0200

> 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: sta...@vger.kernel.org
> Cc: Sowmini Varadhan 
> Cc: David S. Miller 
> Signed-off-by: Vegard Nossum 

Applied.

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

[Santosh Shilimkar]

On 7/3/2016 1:54 AM, Vegard Nossum wrote:

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: sta...@vger.kernel.org
Cc: Sowmini Varadhan 
Cc: David S. Miller 
Signed-off-by: Vegard Nossum 
---

Acked-by: Santosh Shilimkar 

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

[Sowmini Varadhan]

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

Acked-by: Sowmini Varadhan 

[PATCH] RDS: fix rds_tcp_init() error path

[Vegard Nossum]

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: sta...@vger.kernel.org
Cc: Sowmini Varadhan 
Cc: David S. Miller 
Signed-off-by: Vegard Nossum 
---
 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(_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(_tcp_net_ops);
+out_slab:
kmem_cache_destroy(rds_tcp_conn_slab);
 out:
return ret;
-- 
1.9.1