Skip to content

Commit b3a061d

Browse files
vegardgregkh
authored andcommitted
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: 467fa15 ("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>
1 parent d9e1886 commit b3a061d

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

net/rds/tcp.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ static int rds_tcp_init(void)
421421

422422
ret = rds_tcp_recv_init();
423423
if (ret)
424-
goto out_slab;
424+
goto out_pernet;
425425

426426
ret = rds_trans_register(&rds_tcp_transport);
427427
if (ret)
@@ -433,8 +433,9 @@ static int rds_tcp_init(void)
433433

434434
out_recv:
435435
rds_tcp_recv_exit();
436-
out_slab:
436+
out_pernet:
437437
unregister_pernet_subsys(&rds_tcp_net_ops);
438+
out_slab:
438439
kmem_cache_destroy(rds_tcp_conn_slab);
439440
out:
440441
return ret;

0 commit comments

Comments
 (0)