diff options
| author | Vegard Nossum <vegard.nossum@oracle.com> | 2016-07-03 10:54:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-10 12:54:48 +0200 |
| commit | d71872a9cf634d188cd92bd7df7e1958485d2e59 (patch) | |
| tree | e0c0a6fc78ecae7e088be6422cb8bc9fee011ca3 | |
| parent | f3f8ae8b97c9dcae621eff74fd39cf45873d6621 (diff) | |
| download | lwn-d71872a9cf634d188cd92bd7df7e1958485d2e59.tar.gz lwn-d71872a9cf634d188cd92bd7df7e1958485d2e59.zip | |
RDS: fix rds_tcp_init() error path
commit 3dad5424adfb346c871847d467f97dcdca64ea97 upstream.
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: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 86187dad1440..f8d94f4042ef 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c @@ -544,7 +544,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) @@ -556,8 +556,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; |