diff options
author | Vegard Nossum <vegard.nossum@oracle.com> | 2016-07-03 04:54:54 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-07-04 19:09:49 -0400 |
commit | 3dad5424adfb346c871847d467f97dcdca64ea97 (patch) | |
tree | fc7413d94100ca238343f21a327a7a80cd3bb364 | |
parent | d5d5e8d55732c7c35c354e45e3b0af2795978a57 (diff) |
RDS: fix rds_tcp_init() error path
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 <sowmini.varadhan@oracle.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Acked-by: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/rds/tcp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/rds/tcp.c b/net/rds/tcp.c index 74ee126a6fe6..c8a7b4c90190 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c | |||
@@ -616,7 +616,7 @@ static int rds_tcp_init(void) | |||
616 | 616 | ||
617 | ret = rds_tcp_recv_init(); | 617 | ret = rds_tcp_recv_init(); |
618 | if (ret) | 618 | if (ret) |
619 | goto out_slab; | 619 | goto out_pernet; |
620 | 620 | ||
621 | ret = rds_trans_register(&rds_tcp_transport); | 621 | ret = rds_trans_register(&rds_tcp_transport); |
622 | if (ret) | 622 | if (ret) |
@@ -628,8 +628,9 @@ static int rds_tcp_init(void) | |||
628 | 628 | ||
629 | out_recv: | 629 | out_recv: |
630 | rds_tcp_recv_exit(); | 630 | rds_tcp_recv_exit(); |
631 | out_slab: | 631 | out_pernet: |
632 | unregister_pernet_subsys(&rds_tcp_net_ops); | 632 | unregister_pernet_subsys(&rds_tcp_net_ops); |
633 | out_slab: | ||
633 | kmem_cache_destroy(rds_tcp_conn_slab); | 634 | kmem_cache_destroy(rds_tcp_conn_slab); |
634 | out: | 635 | out: |
635 | return ret; | 636 | return ret; |