summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2016-07-12 11:21:17 +0000
committerDavid S. Miller <davem@davemloft.net>2016-07-12 11:07:38 -0700
commit8addc0440bdba9280bf212b70f17f029c2801805 (patch)
treea7bebb2e01072b819e315702983bdb273bbc9974 /net
parent2b8fb41844ec9d6a437b0009f777039d845b1b04 (diff)
downloadop-kernel-dev-8addc0440bdba9280bf212b70f17f029c2801805.zip
op-kernel-dev-8addc0440bdba9280bf212b70f17f029c2801805.tar.gz
rxrpc: Fix error handling in af_rxrpc_init()
security initialized after alloc workqueue, so we should exit security before destroy workqueue in the error handing. Fixes: 648af7fca159 ("rxrpc: Absorb the rxkad security module") Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/rxrpc/af_rxrpc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index d6e4e3b..88effad 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -766,9 +766,9 @@ error_key_type:
error_sock:
proto_unregister(&rxrpc_proto);
error_proto:
- destroy_workqueue(rxrpc_workqueue);
-error_security:
rxrpc_exit_security();
+error_security:
+ destroy_workqueue(rxrpc_workqueue);
error_work_queue:
kmem_cache_destroy(rxrpc_call_jar);
error_call_jar:
OpenPOWER on IntegriCloud